 - Improve handling of -extension wrt dot-qmail
 - More tests

