diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index 08b4ce2e718f211fd4613b87e50b1e7c565c2301..1dfe844ac18656e35e1fe6baaef70244a4aeb323 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -1008,6 +1008,11 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
         self.get_gc_control()
 
         if self.gc_control and self.jid == self.fjid:
+            if self.mtype == 'error':
+                self.msgtxt = _('error while sending %(message)s ( %(error)s )'\
+                    ) % {'message': self.msgtxt,
+                    'error': self.stanza.getErrorMsg()}
+                self.stanza.delChild('html')
             # message from a gc without a resource
             self.mtype = 'groupchat'