Fixed bugs with parsing messages.

Now using a Regex as well.

Signed-off-by: Superbest <superbest@lavabit.com>
Merge pull request #2 from Superbest/master

Fix for message parsing bug