Merge fixes regarding from address that wasn't set on sending MDN partially
from SM 1.5. DEVEL and STABLE are still out of sync due the the existence of
identity.php in the devel branche.

Can the stable team take a look at that?


Can