HotFix for the mail application