diff --git a/.gitignore b/.gitignore
index c6384487a..5e28dee54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ bin/*
 nbproject
 patches-*
 capybara-*.html
+dump.rdb
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 33b7d4c8c..2c36387df 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -24,7 +24,7 @@ class StatusMessage < Post
   def to_activity
     <<-XML
   <entry>
-    <title>#{self.message}</title>
+    <title>#{CGI::escape(self.message)}</title>
     <link rel="alternate" type="text/html" href="#{person.url}status_messages/#{self.id}"/>
     <id>#{person.url}status_messages/#{self.id}</id>
     <published>#{self.created_at.xmlschema}</published>
diff --git a/dump.rdb b/dump.rdb
deleted file mode 100644
index 04bb32a05..000000000
Binary files a/dump.rdb and /dev/null differ
diff --git a/lib/diaspora/ostatus_builder.rb b/lib/diaspora/ostatus_builder.rb
index 6ea1ede89..21b568cf1 100644
--- a/lib/diaspora/ostatus_builder.rb
+++ b/lib/diaspora/ostatus_builder.rb
@@ -33,7 +33,7 @@ module Diaspora
 <subtitle>Posts from Diaspora</subtitle>
 <updated>#{Time.now.xmlschema}</updated>
 <author>
-  <name>#{@user.name}</name>
+  <name>#{CGI::escape(@user.name)}</name>
   <uri>#{@user.public_url}</uri>
 </author>
       XML