am 0c6747a6: am 941d0a46: am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages

* commit '0c6747a60d09b9c9aa0d3f717d8c19d66d7a67a5':
  Make sure old body files don't contaminate new messages