Merge branch 'modest-3-2' of https://git.maemo.org/projects/modest into modest-3-2