Handle + in subject.  Closes #65