Group emails, testing
Group emails with server uid
Merge branch 'feature/GroupEmails' into develop