--- /usr/src/git/contrib/ciabot/ciabot.py-esr	2010-07-31 22:32:47.000000000 +0000
+++ /usr/src/git/contrib/ciabot/ciabot.py	2010-07-31 19:39:20.000000000 +0000
@@ -149,7 +150,11 @@
 
     out = xml % context
 
-    message = '''\
+    global xmlrpc
+    if xmlrpc:
+        message = out
+    else:
+        message = '''\
 Message-ID: <%(merged)s.%(author)address@hidden(project)s>
 From: %(fromaddr)s
 To: %(toaddr)s
@@ -167,7 +172,7 @@
     revformat = do("git config --get ciabot.revformat")
     project = do("git config --get ciabot.project")
     repo = do("git config --get ciabot.repo")
-    xmlrpc = do("git config --get xmlrpc")
+    xmlrpc = do("git config --get ciabot.xmlrpc")
     xmlrpc = xmlrpc and xmlrpc != "false"
 
     host = socket.getfqdn()