Bug 822992 - [email] body block size calculations can become incorrect, lead to failure to split body block, breaking synchronization. r=squib, a=blocking-basecamp.
Merge pull request #7274 from asutherland/email-size-calcs

Bug 822992 - [email] body block size calculations can become incorrect, lead to failure to split body block, breaking synchronization. r=squib, a=blocking-basecamp.
Bug 824190 - [email] once attachments are downloaded, the file size shows NaN. r=squib, a=blocking-basecamp
Merge pull request #7275 from asutherland/email-attachment-size-corruption

Bug 824190 - [email] once attachments are downloaded, the file size shows NaN. r=squib, a=blocking-basecamp
Auto-merge from branch 'master'