Improve doodle bundle (to send mail...)