Bug 821447 - Email with no subject displays "undefined" (fix fallout from original commit)
Merge pull request #7264 from mozsquib/email-no-subject

Bug 821447 - Email with no subject displays "undefined" (fix fallout from original commit)
Auto-merge from branch 'master'