diff --git a/appengine/src/com/google/android/chrometophone/server/XMPPSendServlet.java b/appengine/src/com/google/android/chrometophone/server/XMPPSendServlet.java
index 0972a05..1307083 100644
--- a/appengine/src/com/google/android/chrometophone/server/XMPPSendServlet.java
+++ b/appengine/src/com/google/android/chrometophone/server/XMPPSendServlet.java
@@ -50,6 +50,7 @@ public class XMPPSendServlet extends SendServlet {
         Message message = xmpp.parseMessage(req);
 
         JID fromJid = message.getFromJid();
+        
         String body = message.getBody();
 
         String jid = fromJid.getId();
@@ -59,6 +60,7 @@ public class XMPPSendServlet extends SendServlet {
         }
         
         Map<String, String> params = new HashMap<String, String>();
+        
         String[] bodyParts = body.split("&");
         for (String part: bodyParts) {
             String[] keyValue = part.split("=");
@@ -86,6 +88,7 @@ public class XMPPSendServlet extends SendServlet {
         
         log.info("Sending " + jid);
         doSendToDevice(url, title, sel, jid,
-                    deviceName, deviceType, resp);
+                    deviceName == null ? null : new String[] {deviceName}, 
+                            deviceType, resp);
     }
 }
diff --git a/appengine/war/WEB-INF/appengine-web.xml b/appengine/war/WEB-INF/appengine-web.xml
index ff97b7b..d4d0a74 100644
--- a/appengine/war/WEB-INF/appengine-web.xml
+++ b/appengine/war/WEB-INF/appengine-web.xml
@@ -20,4 +20,7 @@
     <system-properties>
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
     </system-properties>
+    <inbound-services>
+      <service>xmpp_message</service>
+    </inbound-services>
 </appengine-web-app>
diff --git a/appengine/war/WEB-INF/web.xml b/appengine/war/WEB-INF/web.xml
index c2944da..6991469 100644
--- a/appengine/war/WEB-INF/web.xml
+++ b/appengine/war/WEB-INF/web.xml
@@ -30,12 +30,18 @@
         </servlet-class>
     </servlet>
 
-	<servlet>
-		<servlet-name>SendServlet</servlet-name>
-		<servlet-class>com.google.android.chrometophone.server.SendServlet
-		</servlet-class>
-	</servlet>
-	
+        <servlet>
+                <servlet-name>SendServlet</servlet-name>
+                <servlet-class>com.google.android.chrometophone.server.SendServlet
+                </servlet-class>
+        </servlet>
+        
+        <servlet>
+                <servlet-name>XMPPSendServlet</servlet-name>
+                <servlet-class>com.google.android.chrometophone.server.XMPPSendServlet
+                </servlet-class>
+        </servlet>
+        
     <servlet>
         <servlet-name>AuthServlet</servlet-name>
         <servlet-class>com.google.android.chrometophone.server.AuthServlet
@@ -59,11 +65,16 @@
         <url-pattern>/unregister</url-pattern>
     </servlet-mapping>
 
-	<servlet-mapping>
-		<servlet-name>SendServlet</servlet-name>
-		<url-pattern>/send</url-pattern>
-	</servlet-mapping>
-	
+        <servlet-mapping>
+                <servlet-name>XMPPSendServlet</servlet-name>
+                <url-pattern>/_ah/xmpp/message/chat/</url-pattern>
+        </servlet-mapping>
+        
+        <servlet-mapping>
+                <servlet-name>SendServlet</servlet-name>
+                <url-pattern>/send</url-pattern>
+        </servlet-mapping>
+        
     <servlet-mapping>
         <servlet-name>AuthServlet</servlet-name>
         <url-pattern>/signin</url-pattern>