remove mail and add mandrill
merge