diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index d172d48c6c..31e9175b89 100644
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -264,8 +264,32 @@ namespace OpenSim.Groups
 
             int requestStartTick = Environment.TickCount;
 
+            // Copy Message
+            GridInstantMessage msg = new GridInstantMessage();
+            msg.imSessionID = groupID.Guid;
+            msg.fromAgentName = im.fromAgentName;
+            msg.message = im.message;
+            msg.dialog = im.dialog;
+            msg.offline = im.offline;
+            msg.ParentEstateID = im.ParentEstateID;
+            msg.Position = im.Position;
+            msg.RegionID = im.RegionID;
+            msg.binaryBucket = im.binaryBucket;
+            msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
+
+            msg.fromAgentID = im.fromAgentID;
+            msg.fromGroup = true;
+
+            // Send to self first of all
+            msg.toAgentID = msg.fromAgentID; 
+            ProcessMessageFromGroupSession(msg);
+
+            // Then send to everybody else
             foreach (GroupMembersData member in groupMembers)
             {
+                if (member.AgentID.Guid == im.fromAgentID)
+                    continue;
+
                 if (m_groupData.hasAgentDroppedGroupChatSession(member.AgentID.ToString(), groupID))
                 {
                     // Don't deliver messages to people who have dropped this session
@@ -273,22 +297,6 @@ namespace OpenSim.Groups
                     continue;
                 }
 
-                // Copy Message
-                GridInstantMessage msg = new GridInstantMessage();
-                msg.imSessionID = groupID.Guid;
-                msg.fromAgentName = im.fromAgentName;
-                msg.message = im.message;
-                msg.dialog = im.dialog;
-                msg.offline = im.offline;
-                msg.ParentEstateID = im.ParentEstateID;
-                msg.Position = im.Position;
-                msg.RegionID = im.RegionID;
-                msg.binaryBucket = im.binaryBucket;
-                msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
-
-                msg.fromAgentID = im.fromAgentID;
-                msg.fromGroup = true;
-
                 msg.toAgentID = member.AgentID.Guid;
 
                 IClientAPI client = GetActiveClient(member.AgentID);