Closes https://github.com/SchildiChat/SchildiChat-android/issues/41 Change-Id: I0eb9c6c3800309be40a1f5bc0c4420bd4066c098