netmail & other fixes #2