diff --git a/app/models/environment.rb b/app/models/environment.rb
index 9672faf..c7ab434 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -183,8 +183,16 @@ class Environment < ActiveRecord::Base
   # See also #default_hostname
   settings_items :force_www, :default => false
 
-  settings_items :message_for_friend_invitation, :type => String, :default => InviteFriend.mail_template
-  settings_items :message_for_member_invitation, :type => String, :default => InviteMember.mail_template
+  settings_items :message_for_friend_invitation, :type => String
+  def message_for_friend_invitation
+    settings[:message_for_member_invitation] || InviteFriend.mail_template
+  end
+
+  settings_items :message_for_member_invitation, :type => String
+  def message_for_member_invitation
+    settings[:message_for_member_invitation] || InviteMember.mail_template
+  end
+
   settings_items :activation_blocked_text, :type => String
   settings_items :message_for_disabled_enterprise, :type => String
   settings_items :location, :type => String
diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index f5b7882..aaa1abb 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -890,6 +890,15 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal env.message_for_member_invitation, env.invitation_mail_template(community)
   end
 
+  should 'translate friend invitation message' do
+    InviteFriend.expects(:_).returns('').at_least_once
+    Environment.new.message_for_friend_invitation
+  end
+  should 'translate member invitation message' do
+    InviteMember.expects(:_).returns('').at_least_once
+    Environment.new.message_for_member_invitation
+  end
+
   should 'filter fields with white_list filter' do
     environment = Environment.new
     environment.message_for_disabled_enterprise = "<h1> Disabled Enterprise </h1>"
--
libgit2 0.21.2