Check for whether mailstream is enabled wasn't working.  Also add some custom mail headers to aid backtracking problems.