Refactored RwhMailBundle into MailHeader and preference key names sync