Fixed crash on expire mail success, messages where switched accidentally