diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 2dc738479f..a7aa4ea0fb 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -156,6 +156,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
+            // Force timestamp to server time to avoid "Saved on" headers
+            // being generated for online users
+            im.timestamp = (uint)Util.UnixTimeSinceEpoch();
+
             if (dialog == (byte)InstantMessageDialog.MessageFromAgent ||
                 dialog == (byte)InstantMessageDialog.MessageFromObject)
             {