diff --git a/src/common/jingle_ft.py b/src/common/jingle_ft.py
index 7e609086f..535e08445 100644
--- a/src/common/jingle_ft.py
+++ b/src/common/jingle_ft.py
@@ -100,8 +100,6 @@ class JingleFileTransfer(JingleContent):
         self.transport.set_file_props(self.file_props)
         log.info("FT request: %s" % file_props)
 
-        #TODO
-        #add file transfer to queue
         self.session.connection.dispatch('FILE_REQUEST', (jid, file_props))
 
         
diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py
index 32f4c170c..f0776181a 100644
--- a/src/common/protocol/bytestream.py
+++ b/src/common/protocol/bytestream.py
@@ -138,6 +138,8 @@ class ConnectionBytestream:
             jid = gajim.get_jid_without_resource(file_props['sender'])
             resource = gajim.get_resource_from_jid(file_props['sender'])
             
+            gajim.socks5queue.add_file_props(session.ourjid, file_props)
+            
             if not session.accepted:
                 session.approve_session()
                 session.approve_content('file')