Fixed bugs found by A. Themelis
Merge branch 'master' of github.com:alphaville/safemsg