Tested with Gmail only

Should fix #402

I used http://feeding.cloud.geek.nz/posts/combining-multiple-commits-into-one/ and https://help.github.com/articles/dealing-with-non-fast-forward-errors trying to follow your guidelines