Closes https://github.com/SchildiChat/SchildiChat-android/issues/120 Change-Id: Iedcc1808b8408fd82ce8a6ce92c1f0c560b66cc2