Preliminary qmail-toaster commit