diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index ab141eb46a..2dc738479f 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -156,6 +156,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
+            if (dialog == (byte)InstantMessageDialog.MessageFromAgent ||
+                dialog == (byte)InstantMessageDialog.MessageFromObject)
+            {
+                im.offline = 1;
+            }
+
             if (m_TransferModule != null)
             {
                 m_TransferModule.SendInstantMessage(im,