diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index 78b45a0a8..57eaa9d83 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -1311,7 +1311,10 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
             self.displaymarking = self.seclabel.getTag('displaymarking')
 
         if self.stanza.getTag('attention', namespace=nbxmpp.NS_ATTENTION):
-            self.attention = True
+            delayed = self.stanza.getTag('x', namespace=nbxmpp.NS_DELAY) is not\
+                None
+            if not delayed:
+                self.attention = True
 
         self.form_node = self.stanza.getTag('x', namespace=nbxmpp.NS_DATA)
 
diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py
index 44c5868ab..fbc94d4b5 100644
--- a/src/common/protocol/bytestream.py
+++ b/src/common/protocol/bytestream.py
@@ -468,6 +468,9 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
                 if listener:
                     self._add_streamhosts_to_query(query, sender, ext_port,
                         [ext_ip])
+            else:
+                self._add_streamhosts_to_query(query, file_props.sender,
+                    ext_port, [ext_ip])
             self.connection.send(iq)
             cleanup_gupnp()