Fixed #2: Problem with templates without the body-text version
Merge pull request #3 from bameda/master

Fixed #2: Problem with templates without the body-text version