diff --git a/telegram-base.c b/telegram-base.c
index c8b0466..20dcb3a 100644
--- a/telegram-base.c
+++ b/telegram-base.c
@@ -40,6 +40,7 @@
 #include "lodepng/lodepng.h"
 
 
+#define _(m) m
 #define DC_SERIALIZED_MAGIC 0x868aa81d
 #define STATE_FILE_MAGIC 0x28949a93
 #define SECRET_CHAT_FILE_MAGIC 0x37a1988a
@@ -502,6 +503,44 @@ static void request_name_and_code (struct tgl_state *TLS) {
   }
 }
 
+void write_secret_chat_gw (struct tgl_state *TLS, void *extra, int success, struct tgl_secret_chat *E) {
+  if (!success) { return; }
+  write_secret_chat_file (TLS);
+}
+
+static void accept_secret_chat_cb (gpointer _data, const gchar *code) {
+  struct accept_secret_chat_data *data = _data;
+  
+  tgl_do_accept_encr_chat_request (data->TLS, data->U, write_secret_chat_gw, 0);
+  
+  g_free (data);
+}
+
+static void decline_secret_chat_cb (gpointer _data, const gchar *code) {
+  struct accept_secret_chat_data *data = _data;
+  
+  bl_do_encr_chat_delete (data->TLS, data->U);
+  purple_blist_remove_buddy (p2tgl_buddy_find(data->TLS, data->U->id));
+  
+  g_free (data);
+}
+
+void request_accept_secret_chat (struct tgl_state *TLS, struct tgl_secret_chat *U) {
+  connection_data *conn = TLS->ev_base;
+  PurpleBuddy *who = p2tgl_buddy_find (TLS, TGL_MK_USER (U->user_id));
+  struct accept_secret_chat_data *data = g_new (struct accept_secret_chat_data, 1);
+  data->TLS = TLS;
+  data->U = U;
+  
+  gchar *message = g_strdup_printf ("Accept Secret Chat '%s'?", U->print_name);
+  purple_request_accept_cancel (conn->gc, "Secret Chat", message, "Secret chats can only have one "
+                                "end point. If you accept a secret chat on this device, its messages will "
+                                "not be available anywhere else. If you decline, you can accept"
+                                " the chat on other devices.", 0, conn->pa, who->name, NULL, data,
+                                G_CALLBACK(accept_secret_chat_cb), G_CALLBACK(decline_secret_chat_cb));
+  g_free (message);
+}
+
 static void sign_in_callback (struct tgl_state *TLS, void *extra, int success, int registered, const char *mhash) {
   connection_data *conn = TLS->ev_base;
   if (!error_if_val_false (TLS, success, "Invalid phone number",
diff --git a/telegram-base.h b/telegram-base.h
index b805abd..4fd3c8d 100644
--- a/telegram-base.h
+++ b/telegram-base.h
@@ -29,9 +29,11 @@ void write_state_file (struct tgl_state *TLS);
 void write_state_file_schedule (struct tgl_state *TLS);
 void read_secret_chat_file (struct tgl_state *TLS);
 void write_secret_chat_file (struct tgl_state *TLS);
+void write_secret_chat_gw (struct tgl_state *TLS, void *extra, int success, struct tgl_secret_chat *E);
 
 void telegram_login (struct tgl_state *TLS);
 void request_code_entered (gpointer data, const gchar *code);
 int generate_ident_icon(struct tgl_state *TLS, unsigned char* sha1_key);
 
+void request_accept_secret_chat (struct tgl_state *TLS, struct tgl_secret_chat *U);
 #endif
diff --git a/telegram-purple.c b/telegram-purple.c
index b1ac189..ea05c9c 100755
--- a/telegram-purple.c
+++ b/telegram-purple.c
@@ -71,8 +71,6 @@
 #include "tgp-ft.h"
 #include "tgp-msg.h"
 
-#define _(m) m
-
 static void update_message_received (struct tgl_state *TLS, struct tgl_message *M);
 static void update_user_handler (struct tgl_state *TLS, struct tgl_user *U, unsigned flags);
 static void update_user_status_handler (struct tgl_state *TLS, struct tgl_user *U);
@@ -134,33 +132,6 @@ static void update_user_status_handler (struct tgl_state *TLS, struct tgl_user *
   p2tgl_prpl_got_user_status (TLS, U->id, &U->status);
 }
 
-static void write_secret_chat_gw (struct tgl_state *TLS, void *extra, int success, struct tgl_secret_chat *E) {
-  if (!success) { return; }
-  write_secret_chat_file (TLS);
-}
-
-struct accept_secret_chat_data {
-  struct tgl_state *TLS;
-  struct tgl_secret_chat *U;
-};
-
-static void accept_secret_chat_cb (gpointer _data, const gchar *code) {
-  struct accept_secret_chat_data *data = _data;
-  
-  tgl_do_accept_encr_chat_request (data->TLS, data->U, write_secret_chat_gw, 0);
-  
-  g_free (data);
-}
-
-static void decline_secret_chat_cb (gpointer _data, const gchar *code) {
-  struct accept_secret_chat_data *data = _data;
-  
-  bl_do_encr_chat_delete (data->TLS, data->U);
-  purple_blist_remove_buddy (p2tgl_buddy_find(data->TLS, data->U->id));
-  
-  g_free (data);
-}
-
 static void update_secret_chat_handler (struct tgl_state *TLS, struct tgl_secret_chat *U, unsigned flags) {
   debug ("secret-chat-state: %d", U->state);
   
@@ -181,26 +152,11 @@ static void update_secret_chat_handler (struct tgl_state *TLS, struct tgl_secret
   
   if (flags & TGL_UPDATE_REQUESTED && buddy)  {
     connection_data *conn = TLS->ev_base;
-    
     const char* choice = purple_account_get_string (conn->pa, "accept-secret-chats", "ask");
     if (! strcmp (choice, "always")) {
       tgl_do_accept_encr_chat_request (TLS, U, write_secret_chat_gw, 0);
-      
     } else if (! strcmp(choice, "ask")) {
-      PurpleBuddy *who = p2tgl_buddy_find (TLS, TGL_MK_USER(U->user_id));
-      
-      struct accept_secret_chat_data *data = g_new (struct accept_secret_chat_data, 1);
-      data->TLS = TLS;
-      data->U = U;
-     
-      gchar *message = g_strdup_printf ("Accept Secret Chat '%s'?", U->print_name);
-      
-      purple_request_accept_cancel (conn->gc, "Secret Chat", message, "Secret chats can only have one "
-                                    "end point. If you accept a secret chat on this device, its messages will "
-                                    "not be available anywhere else. If you decline, you can accept"
-                                    " the chat on other devices.", 0, conn->pa, who->name, NULL, data,
-                                    G_CALLBACK(accept_secret_chat_cb), G_CALLBACK(decline_secret_chat_cb));
-      g_free (message);
+      request_accept_secret_chat(TLS, U);
     }
   }
   
diff --git a/tgp-structs.h b/tgp-structs.h
index 20e3afd..e2bcdaf 100755
--- a/tgp-structs.h
+++ b/tgp-structs.h
@@ -73,6 +73,11 @@ struct tgp_msg_sending {
   gchar *msg;
 };
 
+struct accept_secret_chat_data {
+  struct tgl_state *TLS;
+  struct tgl_secret_chat *U;
+};
+
 void pending_reads_send_all (GQueue *queue, struct tgl_state *TLS);
 void pending_reads_add (GQueue *queue, tgl_peer_id_t id);
 struct message_text *message_text_init (struct tgl_message *M, gchar *text);