Email and signature bug fixes

A couple of bug fixes:


Ready to start scanning?