Merge changes Ie56161b0,I3de36411 into jb-ub-mail

* changes:
  Fixup setting the correct draft type when editing a draft.
  Forwards should not have the option to remove quoted text