GroupMail refactoring