diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a348d15a7..036ee3673 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -850,7 +850,7 @@ class Mailer < ActionMailer::Base
     @token = token
     @url = url_for(:controller => 'account', :action => 'activate', :token => token.value)
     mail :to => token.user.mail,
-         :subject => l(:mail_subject_register, Setting.app_title)
+         :subject => l(:mail_subject)
   end
 
   def test_email(user)
diff --git a/app/views/settings/_notifications.html.erb b/app/views/settings/_notifications.html.erb
index 588880fe2..6d444fe96 100644
--- a/app/views/settings/_notifications.html.erb
+++ b/app/views/settings/_notifications.html.erb
@@ -4,6 +4,8 @@
 <div class="box tabular settings">
 <p><%= setting_text_field :mail_from, :size => 50 %></p>
 
+<p><%= setting_text_field :mail_subject, :size => 50 %></p>
+
 <p><%= setting_check_box :bcc_recipients %></p>
 
 <p><%= setting_check_box :plain_text_mail %></p>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ac18cda3e..b09ee99a5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -218,6 +218,7 @@ zh:
   setting_pack_attachment_max_size: 附件打包最大限制
   setting_issues_export_limit: 问题导出条目的限制
   setting_mail_from: 邮件发件人地址
+  setting_mail_subject: 注册邮件标题
   setting_bcc_recipients: 使用密件抄送 (bcc)
   setting_plain_text_mail: 纯文本（无HTML）
   setting_host_name: 主机名称
diff --git a/config/settings.yml b/config/settings.yml
index c97fd74ca..f5001947e 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,3 +1,4 @@
+#encoding=utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -60,6 +61,8 @@ per_page_options:
   default: '25,50,100'
 mail_from:
   default: trustieforge@gmail.com
+mail_subject:
+  default: 'Trustie - 用户注册帐号激活通知'
 upload_avatar_max_size:
   format: int
   default: 5242880