removing hard-coded MailStore implementations