#63 Implemented persistence for short messages. Also fixed found issues.