Small patch to fix #53

Hacked up a simple solution for messages disappearing on initial connect. Seems to work reliably.