Merge change 1940

* changes:
  handle OTR messages by storing them in an in-memory table; remove groupchat message urls since we can get to messages by thread ids.