Merge change 23001 into eclair

* changes:
  MessageCompose: BUG 2069196, compose email from the correct account.