Improve Mailr draft