diff --git a/telegram-purple.c b/telegram-purple.c
index ea5fd20..b1ac189 100755
--- a/telegram-purple.c
+++ b/telegram-purple.c
@@ -252,10 +252,9 @@ static void update_marked_read (struct tgl_state *TLS, int num, struct tgl_messa
     } else {
       to_id = list[i]->to_id;
     }
-        PurpleConversation *conv = p2tgl_find_conversation_with_account (TLS, to_id);
+    PurpleConversation *conv = p2tgl_find_conversation_with_account (TLS, to_id);
     if (conv) {
-      conv = p2tgl_conversation_new (TLS, to_id);
-      p2tgl_conversation_write (conv, to_id, "Messages marked as read.",
+      p2tgl_conversation_write (conv, to_id, "Message marked as read.",
                                  PURPLE_MESSAGE_NO_LOG | PURPLE_MESSAGE_SYSTEM, (int)time (NULL));
     }
   }
@@ -613,7 +612,10 @@ static void tgprpl_add_buddy (PurpleConnection * gc, PurpleBuddy * buddy, Purple
   connection_data *conn = purple_connection_get_protocol_data(gc);
   const char* first = buddy->alias ? buddy->alias : "";
   
-  tgl_do_add_contact (conn->TLS, buddy->name, (int)strlen (buddy->name), first, (int)strlen (first), "", 0, 0, on_contact_added, buddy);
+  if (! tgl_peer_get (conn->TLS, TGL_MK_USER (atoi (buddy->name)))) {
+    tgl_do_add_contact (conn->TLS, buddy->name, (int)strlen (buddy->name),
+                        first, (int)strlen (first), "", 0, 0, on_contact_added, buddy);
+  }
 }
 
 static void tgprpl_remove_buddy (PurpleConnection * gc, PurpleBuddy * buddy, PurpleGroup * group) {
@@ -848,7 +850,7 @@ static void tgprpl_init (PurplePlugin *plugin) {
   prpl_info.protocol_options = g_list_append (prpl_info.protocol_options, opt);
   
   opt = purple_account_option_bool_new ("Display read notifications",
-                                        TGP_KEY_HISTORY_RETRIEVAL_THRESHOLD,
+                                        TGP_KEY_DISPLAY_READ_NOTIFICATIONS,
                                         TGP_DEFAULT_DISPLAY_READ_NOTIFICATIONS);
   prpl_info.protocol_options = g_list_append (prpl_info.protocol_options, opt);
   
diff --git a/tgp-2prpl.c b/tgp-2prpl.c
index d45b5e6..3af8380 100644
--- a/tgp-2prpl.c
+++ b/tgp-2prpl.c
@@ -123,6 +123,22 @@ void p2tgl_got_im (struct tgl_state *TLS, tgl_peer_id_t who, const char *msg, in
   g_free (name);
 }
 
+void p2tgl_conversation_write (PurpleConversation *conv, tgl_peer_id_t who, const char *message, int flags, int date) {
+  char *name = p2tgl_strdup_id (who);
+  
+  purple_conversation_write (conv, name, message, flags, date);
+  
+  g_free (name);
+}
+
+void p2tgl_conv_im_write (PurpleConversation *conv, tgl_peer_id_t who, const char *message, int flags, int date) {
+  char *name = p2tgl_strdup_id (who);
+  
+  purple_conv_im_write(purple_conversation_get_im_data(conv), name, message, flags, date);
+  
+  g_free (name);
+}
+
 void p2tgl_got_im_combo (struct tgl_state *TLS, tgl_peer_id_t who, const char *msg, int flags, time_t when) {
   
   /* 
@@ -179,22 +195,6 @@ PurpleConversation *p2tgl_find_conversation_with_account (struct tgl_state *TLS,
   return conv;
 }
 
-void p2tgl_conversation_write (PurpleConversation *conv, tgl_peer_id_t who, const char *message, int flags, int date) {
-  char *name = p2tgl_strdup_id (who);
-  
-  purple_conversation_write (conv, name, message, flags, date);
-  
-  g_free (name);
-}
-
-void p2tgl_conv_im_write (PurpleConversation *conv, tgl_peer_id_t who, const char *message, int flags, int date) {
-  char *name = p2tgl_strdup_id (who);
-  
-  purple_conv_im_write(purple_conversation_get_im_data(conv), name, message, flags, date);
-
-  g_free (name);
-}
-
 PurpleConversation *p2tgl_conversation_new (struct tgl_state *TLS, tgl_peer_id_t who) {
   int type =  tgl_get_peer_type (who) == TGL_PEER_CHAT ? PURPLE_CONV_TYPE_CHAT : PURPLE_CONV_TYPE_IM;