Bugfix and support for fake mail sending