diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index b80206728..a05eacbd1 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -11,7 +11,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ ma
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
+.cl{ clear:both; overflow:hidden; margin-top: 30px;}
 a{ text-decoration:none; }
 a:hover{ text-decoration:underline; }
 .mail_box,ul,li{ list-style-type:none}
@@ -35,7 +35,7 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
  <div class="container">
 	<div class="mail">
     	<div class="mail_head">
-        	<p>亲爱的Trustie用户，您好！</p>
+        	<p><%= l(:mail_issue_greetings)%></p>
         </div><!--mail_head end-->
         <%= yield %>
         <hr />
diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index 5979877a3..c97c82426 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -2,19 +2,19 @@
 <p>
       <span class="c_blue">
         <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
-     </span>在
-  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span>中有了一个与您相关的最新活动，请您关注！</p>
+     </span><%= l(:mail_issue_title_userin)%>
+  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span></span><%= l(:mail_issue_title_active)%></p>
 <div class="mail_box">
 <ul>
-	<li style="list-style-type:none"><span style="float: left"><strong>标题：</strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong>来源：</strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b>项目<%= issue.tracker.name%></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong >内容：</strong></span><span style="float: left; width: 500px">
+	<li style="list-style-type:none"><span style="float: left"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong ><%= l(:mail_issue_content)%></strong></span><span style="float: left; width: 500px">
                     	<%= issue.description %></span>
     </li>
   <li style="list-style-type:none">
 
     <% unless @issue.attachments.nil? %>
-     <span style="float: left"> <strong>附件：</strong>
+     <span style="float: left"> <strong><%= l(:mail_issue_attachments)%></strong>
             </span><span style="float: left; width: 500px">
           <% @issue.attachments.each do |attach| %>
           <p><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %></p>
@@ -25,7 +25,7 @@
   </li>
 </ul>
   <div class="cl"></div>
-  <label  class="mail_reply"><%= link_to( "我要回复", issue_url,  :class => "mail_reply") %></label>
+  <label  class="mail_reply"><%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply") %></label>
   <div class="cl"></div>
 </div>
 <!-- <li><%#=l(:field_author)%>: <%#=h issue.author %></li>
diff --git a/app/views/mailer/_issue.text.erb b/app/views/mailer/_issue.text.erb
index ae80a3fe0..89ee8337e 100644
--- a/app/views/mailer/_issue.text.erb
+++ b/app/views/mailer/_issue.text.erb
@@ -1,13 +1,13 @@
 
         <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
-     在
- <%= link_to(h("#{@issue.project.name}"),@project_url) %>中有了一个与您相关的最新活动，请您关注！
-标题：<%= link_to(issue.subject, issue_url) %>
-  来源：<%= issue.project.name %>|&nbsp;项目缺陷<
- 内容：
+     <%= l(:mail_issue_title_userin)%>
+ <%= link_to(h("#{@issue.project.name}"),@project_url) %><%= l(:mail_issue_title_active)%>
+<%= l(:mail_issue_subject)%><%= link_to(issue.subject, issue_url) %>
+<%= l(:mail_issue_sent_from)%>|&nbsp;<%= l(:mail_issue_from_project)%>
+<%= l(:mail_issue_content)%>
      <%= issue.description %>
         <% unless @issue.attachments.nil? %>
- 附件：
+<%= l(:mail_issue_attachments)%>
 
 
             <% @issue.attachments.each do |attach| %>
@@ -16,4 +16,4 @@
         <% end %>
 
 
- <%= link_to( "我要回复", issue_url) %>
+ <%= link_to( l(:mail_issue_reply), issue_url) %>
diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index 4db0113b9..e46a93381 100644
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -5,5 +5,5 @@
 
 
 </div>
-<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
+<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>
 
diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
index 31d9632db..c5b391685 100644
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@@ -1,3 +1,3 @@
 
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<%= link_to("退订该邮件？", @user_url)  %>
\ No newline at end of file
+<%= link_to( l(:mail_issue_footer), @user_url)  %>
\ No newline at end of file
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index 0c46b5e60..6fcb0ddb5 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -1,15 +1,19 @@
-<%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
+<div>
+  <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
 
-<ul>
-<% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
+  <ul>
+    <% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
       <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
         <li><%= string %></li>
-  <% end %>
-<% end %>
-</ul>
+      <% end %>
+    <% end %>
+  </ul>
+
+  <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
+</div>
+<div class="cl"></div>
+<hr/>
 
-<span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
-<hr />
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
+<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>
 
diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb
index 70e4186c4..aad21ad90 100644
--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@@ -10,7 +10,7 @@
     <%= l(:field_content)%>：<%= @journal.notes %>
 
 <% end -%>
-----------------------------------------
+--------------------------------------------------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
 
-<%= link_to("退订该邮件？", @user_url)  %>
\ No newline at end of file
+<%= link_to( l(:mail_issue_footer), @user_url)  %>
\ No newline at end of file
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 2621d4fa3..47cfb4221 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -123,10 +123,10 @@
       <br/>
     </p>
 
-    <p style="width:400px;padding-left: 50px;">
-      <label style="margin-right: 1px;">
-        <%= l(:label_identity) %><span style="color: #bb0000;"> *</span></label>
-      <select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location" style="margin: 0px;">
+    <p style="width:400px;padding-left: 53px;">
+      <label for="userIdentity">
+        <%= l(:label_identity) %><span class="required"> *</span></label>
+      <select onchange="showtechnical_title(this.value, $('#userTechnical_title'));" name="identity" id="userIdentity" class="location" style="margin: -4px;">
         <option value="">
           <%= l(:label_account_identity_choose) %>
         </option>
@@ -187,19 +187,19 @@
       <!-- added by bai  增加账户里的性别-->
         <span id='gender' style='display:none'>
         <% if @user.user_extensions.nil? %>
-            <p style="width:400px;padding-left: 52px;">
-              <%= l(:label_gender) %>&nbsp;&nbsp;
+            <p style="width:400px;padding-left: 53px;">
+              <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
               <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
             </p>
         <% else %>
             <% if @user.user_extensions.gender == 0 %><!-- label_gender_male -->
-              <p style="width:400px;padding-left: 52px;">
-                <%= l(:label_gender) %>&nbsp;&nbsp;
+              <p style="width:400px;padding-left: 53px;">
+                <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
                 <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
               </p>
             <% else %>
                 <p style="width:400px;padding-left: 54px;">
-                  <%= l(:label_gender) %>&nbsp;&nbsp;
+                  <label for="gender"><%= l(:label_gender) %>&nbsp;&nbsp;</label>
                   <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1' selected='selected'>#{l(:label_gender_female)}</option>".html_safe, :class => 'gender' %>
                 </p>
             <% end %>
@@ -212,9 +212,9 @@
 
 
       <!-- added by Wen -->
-      <p id="occupation_detail" style="padding-left: 24px; display: none">
+      <p id="occupation_detail" style="padding-left: 25px; display: none">
 
-            <%= l(:field_occupation) %>
+            <label for="occupation_name"><%= l(:field_occupation) %></label>
             <span class="required">&nbsp;</span>
         <% if User.current.user_extensions.nil? %>
             <input id="province" name="province" style="display: none" type="text" value="请单击选择省份及学校" readonly>
@@ -318,7 +318,7 @@
           });
       </script>
 
-      <p style="width:400px;padding-left: 55px;"><label style="margin-right: 5px;"><%= l(:label_location) %></label>
+      <p style="width:400px;padding-left: 55px;"><label style="margin-right: 5px;" for="userProvince"><%= l(:label_location) %></label>
         <select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince" class="location">
           <option value="">--请选择省份--</option>
           <option value="北京">北京</option>
@@ -382,7 +382,7 @@
       <legend onclick="toggleFieldset(this);">
         <%= l(:field_mail_notification) %>
       </legend>
-      <div style="padding-left: 8px;"> <!-- modified by ming -->
+      <div style="padding-left: 3px;"> <!-- modified by ming -->
         <p style="width:380px;">
           <%= render :partial => 'users/mail_notifications' %>
         </p></div>
diff --git a/app/views/users/_mail_notifications.html.erb b/app/views/users/_mail_notifications.html.erb
index a8d3edc55..7dd4ad77f 100644
--- a/app/views/users/_mail_notifications.html.erb
+++ b/app/views/users/_mail_notifications.html.erb
@@ -1,5 +1,5 @@
 <p>
-<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted_bak" %>
+<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted_bak" , :style=> 'margin-right: 5px;'%>
 <%= select_tag(
       'user[mail_notification]',
       options_for_select(
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dd79a546c..830ea18e0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -224,7 +224,21 @@ en:
   mail_body_wiki_content_added: "The '%{id}' wiki page has been added by %{author}."
   mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated"
   mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}."
-
+  
+  # edit by meng
+  # emailer
+  mail_issue_greetings: "Dear user , Greetings from Trustie"
+  mail_issue_footer: "Unsubscribe this message?"
+  mail_issue_title_userin: "in"
+  mail_issue_title_active: "has a new activity which relevants to you , please pay more attention to this!"
+  mail_issue_subject: "Title："
+  mail_issue_content: "Content："
+  mail_issue_sent_from: "From："
+  mail_issue_from_project: "project issue"
+  mail_issue_attachments: "Attachments："
+  mail_issue_reply: "Want reply"
+  #end
+  
   field_name: Name
   field_description: Description
   field_summary: Summary
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f36174cf9..7d373ca25 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -233,6 +233,21 @@ zh:
   mail_body_wiki_content_added: "'%{id}' wiki页面已由 %{author} 添加。"
   mail_subject_wiki_content_updated: "'%{id}' wiki页面已更新。"
   mail_body_wiki_content_updated: "'%{id}' wiki页面已由 %{author} 更新。"
+  
+  # edit by meng
+  # emailer
+  mail_issue_greetings: "亲爱的Trustie用户，您好！"
+  mail_issue_footer: "退订该邮件！"
+  mail_issue_title_userin: "在"
+  mail_issue_title_active: "中有了一个与您相关的最新活动，请您关注！"
+  mail_issue_subject: "标题："
+  mail_issue_content: "内容："
+  mail_issue_sent_from: "来源："
+  mail_issue_from_project: "项目问题跟踪"
+  mail_issue_attachments: "附件："
+  mail_issue_reply: "我要回复"
+  #end
+  
   field_name: 名称
   #added by huang
   field_tea_name: 教师