===> Cleaning for dbmail-3.3.1