Merge pull request #8 from FlorianFieber/upstream-fix

Fix patches for Psi #144
Merge pull request #9 from FlorianFieber/upstream-fix

Fix after Psi upstream changes (auto-assigning PGP keys)
Fix after upstream PGP message icon inclusion