Fix other mails for queue