Potential fix for #6604.
Potential fix for #6604.

AtticHacker/geary,githubnemo/geary,glebihan/geary,emersion/geary,rschroll/geary,glebihan/geary,AtticHacker/geary,AtticHacker/geary,mjog/geary,tshikaboom/geary,emersion/geary,jimbonator/geary,robol/geary,abn/geary,glebihan/geary,githubnemo/geary,aatishnn/geary,kyoushuu/geary,aatishnn/geary,robol/geary,robol/geary,martinra/geary,mjog/geary,kpiwko/geary,mpdeimos/geary,jimbonator/geary,githubnemo/geary,MohamedIM/geary-unofficial,kyoushuu/geary,tshikaboom/geary,martinra/geary,emersion/geary,jimbonator/geary,rschroll/geary,aatishnn/geary,tshikaboom/geary,mjog/geary,martinra/geary,geekvigilante/geary