cleanup email a bit. Get rid of circular dependency. doh!
Merge branch 'master' of https://github.com/ProtoTest/Kermit into finish_email