Message plug-in modification!

Problem #2 is fixed in Elgg 1.7.1 (which has not been released yet).