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