[MERGE] mail/chatter complete review/refactoring