Addresses some issues from the hackathon

  * https://github.com/cryptocat/cryptocat/issues/135#issuecomment-22839689

  * https://github.com/cryptocat/cryptocat/pull/413/files#r5829636
Merge pull request #445 from arlolra/hackathon

Addresses some issues from the hackathon
Merge branch 'master' of github.com:cryptocat/cryptocat