diff --git a/src/main/csharp/Commands/Message.cs b/src/main/csharp/Commands/Message.cs
index dd2aebf..d7e8679 100644
--- a/src/main/csharp/Commands/Message.cs
+++ b/src/main/csharp/Commands/Message.cs
@@ -39,7 +39,6 @@
 
         public Message() : base()
         {
-            Timestamp = DateUtils.ToJavaTimeUtc(DateTime.UtcNow);
         }
 
         public override byte GetDataStructureType()
diff --git a/src/main/csharp/Protocol/StompWireFormat.cs b/src/main/csharp/Protocol/StompWireFormat.cs
index eaf0caa..44f3d9b 100644
--- a/src/main/csharp/Protocol/StompWireFormat.cs
+++ b/src/main/csharp/Protocol/StompWireFormat.cs
@@ -306,6 +306,10 @@
             {
                 frame.SetProperty("expires", command.Expiration);
             }
+            if(command.Timestamp != 0)
+            {
+                frame.SetProperty("timestamp", command.Timestamp);
+            }
             if(command.Priority != 4)
             {                
                 frame.SetProperty("priority", command.Priority);