Closes https://github.com/SchildiChat/SchildiChat-android/issues/48 Change-Id: I51dabc18c1542dcd4b8d12769fe1cc76573441c5