Misc updates

Issue #156: Fix instances where /me by the user would show the recipient's name
Issue #118: Provide better behavior for OTR messages