Trying to get attachements working again
Merge pull request #20 from dinshaw/master

Trying to get attachements working again