diff --git a/clickable_nicknames/clickable_nicknames.py b/clickable_nicknames/clickable_nicknames.py
index 73222606ca9744a4296fb3877d927ee5221740b1..06352452e50554181a44bc157c7bd3a377276026 100644
--- a/clickable_nicknames/clickable_nicknames.py
+++ b/clickable_nicknames/clickable_nicknames.py
@@ -126,8 +126,10 @@ class Base(object):
                 self.chat_control.room_jid)
             if nick not in nicks:
                 return
-            nick = nick + gajim.config.get('gc_refer_to_nick_char') + ' '
             message_buffer = self.chat_control.msg_textview.get_buffer()
+            if message_buffer.get_char_count() < 2:
+                nick = nick + gajim.config.get('gc_refer_to_nick_char')
+            nick = nick + ' '
             message_buffer.insert_at_cursor(nick)
             self.chat_control.msg_textview.grab_focus()
 
diff --git a/clickable_nicknames/manifest.ini b/clickable_nicknames/manifest.ini
index 312957bd5a2a930fee5ab0e91d8b3b19283ab2e9..d1db8a80d2eabb6e989d6b0c0e2c3bdc4d2a309d 100644
--- a/clickable_nicknames/manifest.ini
+++ b/clickable_nicknames/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Clickable Nicknames
 short_name: clickable_nicknames
-version: 0.2.2
+version: 0.2.3
 description: Clickable nicknames in the conversation textview.
 authors: Denis Fomin <fominde@gmail.com>
 homepage: http://trac-plugins.gajim.org/wiki/ClickableNicknamesPlugin