Fixes: #2187 cleaning up the mail group tab