Add usemailfilter option to account attribute (refs #3911)
Better search for account (refs #3912)
Merge pull request #812 from thingthing/3.2-I3911

3.2 i3911