diff --git a/src/common/jingle_ft.py b/src/common/jingle_ft.py
index bc08c741d..eec4aa79a 100644
--- a/src/common/jingle_ft.py
+++ b/src/common/jingle_ft.py
@@ -92,6 +92,12 @@ class JingleFileTransfer(JingleContent):
 
         file_props['session-type'] = 'jingle'
 
+        security = content.getTag('security')
+        if not security:
+            self.use_security = False
+        else:
+            self.use_security = True
+        
         file_tag = content.getTag('description').getTag('offer').getTag('file')
         for attribute in file_tag.getAttrs():
             if attribute in ('name', 'size', 'hash', 'date'):
@@ -130,6 +136,11 @@ class JingleFileTransfer(JingleContent):
 
     def __on_session_accept(self, stanza, content, error, action):
         log.info("__on_session_accept")
+        
+        security = content.getTag('security')
+        if not security: # responder can not verify our fingerprint
+            self.use_security = False
+            
 
     def __on_session_terminate(self, stanza, content, error, action):
         log.info("__on_session_terminate")
diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py
index ff0bd6599..509b01218 100644
--- a/src/common/protocol/bytestream.py
+++ b/src/common/protocol/bytestream.py
@@ -135,8 +135,6 @@ class ConnectionBytestream:
             session = self.get_jingle_session(file_props['sender'], file_props['sid'])
             if not session:
                 return
-            jid = gajim.get_jid_without_resource(file_props['sender'])
-            resource = gajim.get_resource_from_jid(file_props['sender'])
             sid = file_props['sid']
             gajim.socks5queue.add_file_props(self.name, file_props)