more diff fixes
Merge pull request #213 from xithan/revandmail

more diff fixes