Bug #386113 - Show custom alarm message in pop-up alerts
Bug #693216 - Email type is changed to other after merging