Closes https://github.com/SchildiChat/SchildiChat-android/issues/100 Change-Id: I0ef5580f41bd90a0f5b5c350ee2a51ca12f70e40