diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 5c0778df5a36c3d5c81666ecd2602b75527e0e06..45777b82a163d8eb20551e10eab9843bd32db284 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -83,7 +83,7 @@ class Conversation < ActiveRecord::Base
   end
 
   def subject
-    self[:subject].blank? ? "no subject" : self[:subject]
+    self[:subject].blank? ? I18n.t("conversations.new.subject_default") : self[:subject]
   end
 
   def subscribers(user)
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 4ba93dc2101fc8f15dee68b33d8117b010445187..4c12ce8c9375643325773601e2da4b1b8ca321b7 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -350,6 +350,7 @@ en:
     new:
       to: "To"
       subject: "Subject"
+      subject_default: "No subject"
       send: "Send"
       sending: "Sending..."
       abandon_changes: "Abandon changes?"