am 53f86bde: Merge "fix rotate + save draft creating multiple drafts" into jb-ub-mail

* commit '53f86bde04a018669a5b51afda57e5711bbf452a':
  fix rotate + save draft creating multiple drafts