bugfixes, cleaner code

requires MailBeez v1.7 or higher

More...