diff --git a/OpenSim/Addons/Groups/GroupsMessagingModule.cs b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
index f8ed18e2c6..e3f7ddbffc 100755
--- a/OpenSim/Addons/Groups/GroupsMessagingModule.cs
+++ b/OpenSim/Addons/Groups/GroupsMessagingModule.cs
@@ -606,22 +606,22 @@ namespace OpenSim.Groups
                     if (eq != null)
                     {
                         eq.ChatterboxInvitation(
-                        GroupID
-                        , groupInfo.GroupName
-                        , fromAgent
-                        , msg.message
-                        , AgentID
-                        , msg.fromAgentName
-                        , msg.dialog
-                        , msg.timestamp
-                        , msg.offline == 1
-                        , (int)msg.ParentEstateID
-                        , msg.Position
-                        , 1
-                        , new UUID(msg.imSessionID)
-                        , msg.fromGroup
-                        , OpenMetaverse.Utils.StringToBytes(groupInfo.GroupName)
-                        );
+                            GroupID
+                            , groupInfo.GroupName
+                            , fromAgent
+                            , msg.message
+                            , AgentID
+                            , msg.fromAgentName
+                            , msg.dialog
+                            , msg.timestamp
+                            , msg.offline == 1
+                            , (int)msg.ParentEstateID
+                            , msg.Position
+                            , 1
+                            , new UUID(msg.imSessionID)
+                            , msg.fromGroup
+                            , OpenMetaverse.Utils.StringToBytes(groupInfo.GroupName)
+                            );
 
                         var update = new GroupChatListAgentUpdateData(AgentID);
                         var updates = new List<GroupChatListAgentUpdateData> { update };
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 88e49acc47..48eefe622d 100755
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -169,12 +169,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                     if (req.HttpContext.IsSending())
                     {
-                        if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
-                        {
-                            req.PollServiceArgs.Drop(req.RequestID, req.PollServiceArgs.Id);
-                        }
-                        else
-                            ReQueueEvent(req);
+                        ReQueueEvent(req);
                         continue;
                     }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 76eba90f7f..57c126f579 100755
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -516,11 +516,11 @@ namespace OpenSim.Region.ClientStack.Linden
 
             totalSize += EventHeader.Length;
 
-            StringBuilder sb = new StringBuilder();
+            StringBuilder sb = new StringBuilder(1024);
             LLSDxmlEncode.AddEndArray(sb); // events array
                 LLSDxmlEncode.AddElem("id", thisID, sb);
             LLSDxmlEncode.AddEndMap(sb);
-            element = Encoding.UTF8.GetBytes(LLSDxmlEncode.End(sb));
+            element = LLSDxmlEncode.EndToNBBytes(sb);
             elements.Add(element);
             totalSize += element.Length;
 
@@ -531,8 +531,9 @@ namespace OpenSim.Region.ClientStack.Linden
             //temporary
             byte[] finalData = new byte[totalSize];
             int dst = 0;
-            foreach(byte[] src in elements)
+            for(int i = 0; i < elements.Count; ++i)
             {
+                byte[] src = elements[i];
                 Array.Copy(src, 0, finalData, dst, src.Length);
                 dst += src.Length;
             }