Closes https://github.com/SchildiChat/SchildiChat-android/issues/111 Change-Id: I4c963caabdb10fa601799d3cb3fed2ad96d3d54c