Adding email template notification see BT#6041 + fixing BT#6221