diff --git a/product/CMFActivity/ActivityTool.py b/product/CMFActivity/ActivityTool.py
index 24cfcc60fc71309a22d504bd208bd1433e84cb5c..158e2b0f56489744f0125e2a632d8e331f6fe1d5 100644
--- a/product/CMFActivity/ActivityTool.py
+++ b/product/CMFActivity/ActivityTool.py
@@ -1084,6 +1084,10 @@ class ActivityTool (Folder, UniqueObject):
       try:
         message(my_self)
       finally:
+        if my_self is not self: # We rewrapped self
+          # Restore default skin selection
+          skinnable = self.getPortalObject()
+          skinnable.changeSkin(skinnable.getSkinNameFromRequest(request))
         if old_ihotfix_context is not False:
           # Restore iHotfix context
           id = get_ident()