Merge pull request #1607 from Oldiesmann/release-2.1

! Custom message icons will fail in PostgreSQL (fixes #1605)