Towards v1.2
Message buffering in app...