Merge "Stop saving extra drafts!" into jb-ub-mail