diff --git a/tgp-ft.c b/tgp-ft.c
index 5b06c52..dc71bbb 100644
--- a/tgp-ft.c
+++ b/tgp-ft.c
@@ -27,6 +27,8 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
+static void tgprpl_xfer_free_data (struct tgp_xfer_send_data *data);
+
 static void tgprpl_xfer_recv_on_finished (struct tgl_state *TLS, void *_data, int success, char *filename) {
   debug ("tgprpl_xfer_recv_on_finished()");
   struct tgp_xfer_send_data *data = _data;
@@ -36,6 +38,7 @@ static void tgprpl_xfer_recv_on_finished (struct tgl_state *TLS, void *_data, in
       debug ("purple_xfer_set_completed");
       purple_xfer_set_bytes_sent (data->xfer, purple_xfer_get_size (data->xfer));
       purple_xfer_set_completed (data->xfer, TRUE);
+      purple_xfer_end(data->xfer);
     }
     
     g_unlink (purple_xfer_get_local_filename (data->xfer));
@@ -44,9 +47,9 @@ static void tgprpl_xfer_recv_on_finished (struct tgl_state *TLS, void *_data, in
   } else {
     failure ("ERROR xfer failed");
   }
-  
-  if (data->timer) { purple_timeout_remove(data->timer); }
-  data->timer = 0;
+
+  data->xfer->data = NULL;
+  tgprpl_xfer_free_data (data);
 }
 
 static void tgprpl_xfer_on_finished (struct tgl_state *TLS, void *_data, int success, struct tgl_message *M) {
@@ -58,21 +61,19 @@ static void tgprpl_xfer_on_finished (struct tgl_state *TLS, void *_data, int suc
       debug ("purple_xfer_set_completed");
       purple_xfer_set_bytes_sent (data->xfer, purple_xfer_get_size (data->xfer));
       purple_xfer_set_completed (data->xfer, TRUE);
+      purple_xfer_end(data->xfer);
     }
   } else {
     failure ("ERROR xfer failed");
   }
   
-  if (data->timer) { purple_timeout_remove(data->timer); }
-  data->timer = 0;
+  data->xfer->data = NULL;
+  tgprpl_xfer_free_data (data);
 }
 
 static void tgprpl_xfer_canceled (PurpleXfer *X) {
   struct tgp_xfer_send_data *data = X->data;
-  data->done = TRUE;
-  
-  if (data->timer) { purple_timeout_remove (data->timer); }
-  data->timer = 0;
+  tgprpl_xfer_free_data (data);
 }
 
 static gboolean tgprpl_xfer_upload_progress (gpointer _data) {
@@ -87,7 +88,7 @@ static gboolean tgprpl_xfer_upload_progress (gpointer _data) {
       purple_xfer_set_bytes_sent (X, conn->TLS->cur_uploaded_bytes);
       purple_xfer_update_progress (X);
       
-      debug ("PURPLE_XFER_RECEIVER progress %d / %d", conn->TLS->cur_uploaded_bytes, conn->TLS->cur_uploading_bytes);
+      debug ("PURPLE_XFER_SEND progress %d / %d", conn->TLS->cur_uploaded_bytes, conn->TLS->cur_uploading_bytes);
       if (conn->TLS->cur_uploaded_bytes == conn->TLS->cur_uploading_bytes) {
         data->timer = 0;
         return FALSE;
@@ -99,7 +100,7 @@ static gboolean tgprpl_xfer_upload_progress (gpointer _data) {
       purple_xfer_set_bytes_sent (X, conn->TLS->cur_downloaded_bytes);
       purple_xfer_update_progress (X);
       
-      debug ("PURPLE_XFER_RECEIVER progress %d / %d", conn->TLS->cur_downloading_bytes, conn->TLS->cur_downloaded_bytes);
+      debug ("PURPLE_XFER_RECEIVER progress %d / %d", conn->TLS->cur_downloaded_bytes, conn->TLS->cur_downloading_bytes);
       if (conn->TLS->cur_downloading_bytes == conn->TLS->cur_downloaded_bytes) {
         data->timer = 0;
         return FALSE;
@@ -154,13 +155,30 @@ static void tgprpl_xfer_send_init (PurpleXfer *X) {
 
 static void tgprpl_xfer_init_data (PurpleXfer *X, connection_data *conn, struct tgl_document *D) {
   if (!X->data) {
-    // TODO: free this somewhere
     struct tgp_xfer_send_data *data = g_malloc0 (sizeof (struct tgp_xfer_send_data));
     data->xfer = X;
     data->conn = conn;
     data->document = D;
     X->data = data;
-    conn->transfers = g_list_append (conn->transfers, data);
+  }
+}
+
+static void tgprpl_xfer_free_data (struct tgp_xfer_send_data *data) {
+    if (data->timer) { purple_input_remove(data->timer); }
+    data->timer = 0;
+    g_free (data);
+}
+
+void tgprpl_xfer_free_all (connection_data *conn) {
+  GList *xfers = purple_xfers_get_all();
+  while (xfers) {
+    PurpleXfer *xfer = xfers->data;
+    struct tgp_xfer_send_data *data = xfer->data;
+    
+    if (data) {
+      purple_xfer_cancel_local (xfer);
+    }
+    xfers = g_list_next(xfers);
   }
 }
 
diff --git a/tgp-ft.h b/tgp-ft.h
index f20b186..e12a95e 100644
--- a/tgp-ft.h
+++ b/tgp-ft.h
@@ -22,8 +22,13 @@
 #define __telegram_adium__tgp_ft__
 
 #include <stdio.h>
+#include <tgl.h>
+
+#include "tgp-structs.h"
 
 PurpleXfer *tgprpl_new_xfer (PurpleConnection * gc, const char *who);
 void tgprpl_send_file (PurpleConnection * gc, const char *who, const char *file);
 void tgprpl_recv_file (PurpleConnection * gc, const char *who, struct tgl_document *D);
+void tgprpl_xfer_free_all (connection_data *conn);
+
 #endif
diff --git a/tgp-structs.c b/tgp-structs.c
index c1f3e50..ab5a2ed 100644
--- a/tgp-structs.c
+++ b/tgp-structs.c
@@ -22,6 +22,7 @@
 #include "purple.h"
 #include "msglog.h"
 #include "tgp-utils.h"
+#include "tgp-ft.h"
 
 #include <glib.h>
 #include <tgl.h>
@@ -106,7 +107,7 @@ void *connection_data_free (connection_data *conn) {
   tgp_g_queue_free_full (conn->pending_reads, pending_reads_free_cb);
   tgp_g_queue_free_full (conn->new_messages, message_text_free);
   tgp_g_list_free_full (conn->used_images, used_image_free);
-  tgp_g_list_free_full (conn->transfers, tgp_xfer_send_data_free);
+  tgprpl_xfer_free_all (conn);
   tgl_free_all (conn->TLS);
   free (conn->TLS);
   
diff --git a/tgp-structs.h b/tgp-structs.h
index e8f114e..602d0c4 100755
--- a/tgp-structs.h
+++ b/tgp-structs.h
@@ -37,7 +37,6 @@ typedef struct {
   GList *used_images;
   guint write_timer;
   guint login_timer;
-  GList *transfers;
   int in_fallback_chat;
 } connection_data;