Closes https://github.com/SchildiChat/SchildiChat-android/issues/97 Change-Id: I31095c9677a5c00162d8cb2416a12c31ad77f372