Bug fix for non-attachment email