Back port commits 201af223, 0c1f6142, 343f3ba0 and 730b33d8. Those fix
bgo#713703, bgo#726943, bgo@726770 and bgo#713983.

All of these patches are committed upstream and should be gone when
geary gets updated.

While here mute a replace command in the port Makefile.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19607 df743ca5-7f9a-e211-a948-0013205c9059