Fix #2516 (display error with carbons)

- fix the bug where messages from our own jid were incorrectly displayed
- the nick is now fixed for the whole conversation