Closes https://github.com/SchildiChat/SchildiChat-android/issues/40. Change-Id: I744b1a7d5cb39a747ae17744f9a258a628a2c878