fixes for CRM-14064

----------------------------------------
* CRM-14064: Uploading content for mailing results in empty message text and subject line
  http://issues.civicrm.org/jira/browse/CRM-14064
Merge pull request #2338 from kurund/CRM-14064

fixes for CRM-14064