am 9bb1a07e: Merge "Set MIME type correctly on drafts when content provider does not provide it." into jb-ub-mail-ur8

* commit '9bb1a07e3cafb02008e9ef6884018ad702b6059b':
  Set MIME type correctly on drafts when content provider does not provide it.