am 89e67c7f: Merge "fix custom reply-from when composing from scratch" into jb-ub-mail

* commit '89e67c7f788774f228665a415ed8cabdf068797b':
  fix custom reply-from when composing from scratch