fixed possible npe when loading null counterpart into message
Merge branch 'development' of https://github.com/siacs/Conversations into development