diff --git a/Ooui/JsonConvert.cs b/Ooui/JsonConvert.cs
index 2cde941..1eddd06 100644
--- a/Ooui/JsonConvert.cs
+++ b/Ooui/JsonConvert.cs
@@ -4,7 +4,7 @@ namespace Ooui
 {
     class JsonConvert
     {
-        static void WriteJsonString (System.IO.TextWriter w, string s)
+        public static void WriteJsonString (System.IO.TextWriter w, string s)
         {
             w.Write ('\"');
             for (var i = 0; i < s.Length; i++) {
diff --git a/Ooui/Message.cs b/Ooui/Message.cs
index 0ba8798..5db69af 100644
--- a/Ooui/Message.cs
+++ b/Ooui/Message.cs
@@ -52,14 +52,16 @@ namespace Ooui
             w.Write (TargetId);
             w.Write ("\",\"k\":\"");
             w.Write (Key);
+            w.Write ('\"');
             if (Value != null) {
-                w.Write ("\",\"v\":");
+                w.Write (",\"v\":");
                 JsonConvert.WriteJsonValue (w, Value);
-                w.Write ('}');
             }
-            else {
-                w.Write ("\"}");
+            if (ResultId != null) {
+                w.Write (",\"rid\":");
+                JsonConvert.WriteJsonString (w, ResultId);
             }
+            w.Write ('}');
         }
 
         public string ToJson ()