diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index 9163b7092..0e51eb22c 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -2001,9 +2001,12 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
             else:
                 file_tag = desc.getTag('request').getTag('file')
                 h = file_tag.getTag('hash')
+                h = h.getData() if h else None
                 n = file_tag.getTag('name')
+                n = n.getData() if n else None
                 pjid = gajim.get_jid_without_resource(self.fjid)
-                file_info = self.conn.get_file_info(pjid, hash_=h, name=n)
+                file_info = self.conn.get_file_info(pjid, hash_=h,
+                                                name=n,account=self.conn.name)
                 self.file_props.file_name = file_info['file-name']
                 self.file_props.sender = self.conn._ft_get_our_jid()
                 self.file_props.receiver = self.fjid
diff --git a/src/common/jingle.py b/src/common/jingle.py
index 4b466e4ad..9d4e86f54 100644
--- a/src/common/jingle.py
+++ b/src/common/jingle.py
@@ -161,7 +161,6 @@ class ConnectionJingle(object):
         return c.transport.sid
 
     def __hash_support(self, contact):
-
         if contact.supports(xmpp.NS_HASHES):
             if contact.supports(xmpp.NS_HASHES_MD5):
                 return 'md5'
@@ -171,7 +170,6 @@ class ConnectionJingle(object):
                 return 'sha-256'
             elif contact.supports(xmpp.NS_HASHES_SHA512):
                 return 'sha-512'
-
         return None
 
     def iter_jingle_sessions(self, jid, sid=None, media=None):
@@ -194,7 +192,7 @@ class ConnectionJingle(object):
         # to be requested again.
         self.files.append(file_)
 
-    def get_file_info(self, peerjid, hash_=None, name=None):
+    def get_file_info(self, peerjid, hash_=None, name=None, account=None):
         if hash_:
             for f in self.files: # DEBUG
                 #if f['hash'] == '1294809248109223':
diff --git a/src/common/jingle_session.py b/src/common/jingle_session.py
index 84ec8266c..fda962d53 100644
--- a/src/common/jingle_session.py
+++ b/src/common/jingle_session.py
@@ -520,9 +520,12 @@ class JingleSession(object):
             if request:
                 self.request = True
                 h = request.getTag('file').getTag('hash')
+                h = h.getData() if h else None
                 n = request.getTag('file').getTag('name')
+                n = n.getData() if n else None
                 pjid = gajim.get_jid_without_resource(self.peerjid)
-                file_info = self.connection.get_file_info(pjid, h, n)
+                file_info = self.connection.get_file_info(pjid, h, n,
+                                                     self.connection.name)
                 if not file_info:
                     log.warning('The peer ' + pjid + \
                                 ' is requesting a ' + \