add pending messages and acknowledgements to server and Android client