Refactored RwhMailBundle into MailHeader and preference key names sync
mergeing v3.7 progress into beta branch