fix control dialog
mailer
merge