Merge change Ib17b43c7 into eclair

* changes:
  MessageCompose: avoid saving Draft early, before the message was loaded.