diff --git a/lib/diaspora_federation/validators/status_message_validator.rb b/lib/diaspora_federation/validators/status_message_validator.rb
index dabe3ef..15ab208 100644
--- a/lib/diaspora_federation/validators/status_message_validator.rb
+++ b/lib/diaspora_federation/validators/status_message_validator.rb
@@ -8,6 +8,8 @@ module DiasporaFederation
 
       rule :guid, :guid
 
+      rule :raw_message, length: {maximum: 65_535}
+
       rule :photos, :not_nil
 
       rule :public, :boolean
diff --git a/spec/lib/diaspora_federation/validators/status_message_validator_spec.rb b/spec/lib/diaspora_federation/validators/status_message_validator_spec.rb
index 9d5d360..70a33ef 100644
--- a/spec/lib/diaspora_federation/validators/status_message_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/status_message_validator_spec.rb
@@ -24,5 +24,13 @@ module DiasporaFederation
     it_behaves_like "a boolean validator" do
       let(:property) { :public }
     end
+
+    describe "#raw_message" do
+      it_behaves_like "a property with a value validation/restriction" do
+        let(:property) { :raw_message }
+        let(:wrong_values) { ["a" * 65_536] }
+        let(:correct_values) { ["a" * 65_535, nil, ""] }
+      end
+    end
   end
 end