diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index d8cd8eeec..6cebfef7a 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -74,7 +74,7 @@ class JournalsController < ApplicationController
     text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
     @content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> "
     @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
-    @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content
+    # @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content
     @id = user.id
   rescue ActiveRecord::RecordNotFound
     render_404
diff --git a/app/views/journals/new.js.erb b/app/views/journals/new.js.erb
index d02568426..ae2574595 100644
--- a/app/views/journals/new.js.erb
+++ b/app/views/journals/new.js.erb
@@ -1,11 +1,11 @@
-$('#journal_issue_note').html("<%= raw escape_javascript(@content.html_safe) %>");
-$("input[name='issue_quote_new']").val("<%= raw escape_javascript(@content.html_safe) %>");
+$('#issue_notes').val("<%= raw escape_javascript(@content) %>");
 <%
   # when quoting a private journal, check the private checkbox
-  if @journal && @journal.private_notes?
+  if @journal && @journal.private_notes? 
 %>
 $('#issue_private_notes').attr('checked', true);
 <% end %>
+
 showAndScrollTo("update", "notes");
 $('#notes').scrollTop = $('#notes').scrollHeight - $('#notes').clientHeight;
 
diff --git a/config/configuration.yml b/config/configuration.yml
index 390754a87..111efc8b4 100644
--- a/config/configuration.yml
+++ b/config/configuration.yml
@@ -103,7 +103,7 @@ default:
   # autologin_cookie_name: the name of the cookie (default: autologin)
   # autologin_cookie_path: the cookie path (default: /)
   # autologin_cookie_secure: true sets the cookie secure flag (default: false)
-  autologin_cookie_name: "autologin_trustie"
+  autologin_cookie_name:
   autologin_cookie_path:
   autologin_cookie_secure:
 
@@ -200,7 +200,7 @@ default:
 # specific configuration options for production environment
 # that overrides the default ones
 production:
-  cookie_domain: ".trustie.net"
+  # CJK support
   rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
   email_delivery:
     delivery_method: :smtp
@@ -218,9 +218,9 @@ development:
   email_delivery:
     delivery_method: :smtp
     smtp_settings:
-      address: mail.trustie.net
+      address: smtp.163.com
       port: 25
-      domain: mail.trustie.net
-      authentication: :login
-      user_name: "mail@trustie.net"
-      password: "loong2010"
+      domain: smtp.163.com
+      authentication: :plain
+      user_name: huang.jingquan@163.com
+      password: 'xinhu1ji2qu366'