refs #65 #67 removed mail interceptor duplication