fix a compose test race related to drafts. a=test-only
Merge pull request #305 from asutherland/fix-compose-race

fix a compose test race related to drafts. a=test-only
Bug 1004137 - headerCount not updated for messages older than slice or where ignoreHeaders is true.  Fix and tests. r=jrburke