Merge "Restore draft." into jb-ub-mail