diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 5fd0105f4..fcc96e654 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -39,9 +39,7 @@ class PublicsController < ApplicationController
   end
 
   def hub
-    if params['hub.mode'] == 'subscribe' || params['hub.mode'] == 'unsubscribe'
-      render :text => params['hub.challenge'], :status => 202, :layout => false
-      end
+    render :text => params['hub.challenge'], :status => 202, :layout => false
   end
 
   def receive
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 35503c463..278941471 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -88,6 +88,7 @@ class StatusMessage < Post
     <<-XML
   <entry>
     <title>#{x(self.formatted_message(:plain_text => true))}</title>
+    <content>#{x(self.formatted_message(:plain_text => true))}</content>
     <link rel="alternate" type="text/html" href="#{self.author.url}status_messages/#{self.id}"/>
     <id>#{self.author.url}posts/#{self.id}</id>
     <published>#{self.created_at.xmlschema}</published>
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index 7fe29a526..7fd6d9a3b 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -100,4 +100,11 @@ describe PublicsController do
       response.should be_not_found
     end
   end
+
+  describe '#hub' do
+    it 'succeeds' do
+      get :hub
+      response.should be_success
+    end
+  end
 end