CHANGE: Fix email quick search.
Merge branch 'development' of https://github.com/engagepoint/labs-test-message-server into development