diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/procesor/AlarmMessageProcessor.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/procesor/AlarmMessageProcessor.java
index 24c94f424..8d02ded71 100644
--- a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/procesor/AlarmMessageProcessor.java
+++ b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/procesor/AlarmMessageProcessor.java
@@ -138,16 +138,16 @@ public class AlarmMessageProcessor {
         String title = (exceptionAlarmSize > 0 ? "[Error]" : "[Warning]")
                 + " Dear  "
                 + userName
-                + ", SkyWalking collects "
+                + ", Skywalking has collected  "
                 + (exceptionAlarmSize > 0 ? exceptionAlarmSize
-                + " tid of system exceptions, " : "");
+                + "  system exception message(s)   " : "");
         if (count > exceptionAlarmSize) {
-            title += (count - exceptionAlarmSize) + " tid of warnings, ";
+            title += exceptionAlarmSize > 0 ? "and " : ""  + (count - exceptionAlarmSize) + " system warning message(s) ";
         }
         title += "between "
                 + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(
                 startTime * 10000 * 6))
-                + " to "
+                + " and "
                 + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(
                 endTime * 10000 * 6));
 
diff --git a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/MailSender.java b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/MailSender.java
index f7cddb238..16a073659 100644
--- a/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/MailSender.java
+++ b/skywalking-alarm/src/main/java/com/a/eye/skywalking/alarm/util/MailSender.java
@@ -26,9 +26,6 @@ public class MailSender {
 
             config.setProperty("mail.transport.protocol", Config.MailSenderInfo.TRANSPORT_PROTOCOL);
             config.setProperty("mail.smtp.auth", String.valueOf(Config.MailSenderInfo.SMTP_AUTH));
-            config.setProperty("mail.smtp.socketFactory.port", "587");
-            config.setProperty("mail.debug", "true");
-            //config.setProperty("mail.smtp.ssl.enable", "true");
             if (Config.MailSenderInfo.SSL_ENABLE) {
                 MailSSLSocketFactory sf = new MailSSLSocketFactory();
                 sf.setTrustAllHosts(true);
diff --git a/skywalking-alarm/src/main/resources/mail-template.ftl b/skywalking-alarm/src/main/resources/mail-template.ftl
index 5353137e1..883a698c7 100644
--- a/skywalking-alarm/src/main/resources/mail-template.ftl
+++ b/skywalking-alarm/src/main/resources/mail-template.ftl
@@ -90,7 +90,7 @@
 
 <div id="mainDiv">
     <p class="greetings">Dear ${name!}:</p>
-    <p class="greetings">&nbsp&nbsp&nbsp&nbspOur platform collects alarm infomation between <b>${startDate!} </b>to<b> ${endDate!}</b> as follows:
+    <p class="greetings">&nbsp&nbsp&nbsp&nbspHere are the alarm message(s) between <b>${startDate!} </b> and <b> ${endDate!}</b> :
     </p>
     <table id="dataTable" width="80%">
         <tr id="dataTableHead">
diff --git a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmMessageSender.java b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmMessageSender.java
index 81a41075c..8cc237ea5 100644
--- a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmMessageSender.java
+++ b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmMessageSender.java
@@ -17,7 +17,7 @@ public class AlarmMessageSender {
         Jedis jedis = null;
         try {
             jedis = AlarmRedisConnector.getJedis();
-            if (jedis != null)
+            if (jedis == null)
                 return;
             jedis.hsetnx(alarmKey, traceId, message);
             jedis.expire(alarmKey, Config.Alarm.ALARM_EXPIRE_SECONDS);
diff --git a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmRedisConnector.java b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmRedisConnector.java
index 4c9cff6e3..6386655b1 100644
--- a/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmRedisConnector.java
+++ b/skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/alarm/sender/AlarmRedisConnector.java
@@ -22,7 +22,7 @@ public class AlarmRedisConnector {
     }
 
     public static Jedis getJedis() {
-        if (Config.Alarm.ALARM_OFF_FLAG) {
+        if (!Config.Alarm.ALARM_OFF_FLAG) {
             return null;
         } else {
             return jedisPool.getResource();
diff --git a/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl b/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl
index 883c2a9dc..97d3911a3 100644
--- a/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl
+++ b/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl
@@ -80,7 +80,7 @@
                         <td>....</td>
                         <td>....</td>
                         <td>....</td>
-                        <td style="text-align:center;color:green;">The number of call chain node is great than the max query node size({{>maxQueryNodeSize}})， only call entry node is displayed.</td>
+                        <td style="text-align:center;color:green;">The number of span is great than the max query span size({{>maxQueryNodeSize}}), only call entry span is displayed.</td>
                         <td>....</td>
                         <td>....</td>
                     </tr>
@@ -90,8 +90,9 @@
                         <td>....</td>
                         <td>....</td>
                         <td>....</td>
-                        <td style="text-align:center;color:green;">The total  of  call chain node is {{>totalSize}}，but the number is great than then max number of showing node({{>maxShowNodeSize}})
-                        ， Only the first {{>showSize}} chain node are displayed.</td>
+                        <td style="text-align:center;color:green;">The total number of span is {{>totalSize}}，but the number is great than then max show number
+                        ({{>maxShowNodeSize}})
+                        ， Only the first {{>showSize}} spans are displayed.</td>
                         <td>....</td>
                         <td>....</td>
                     </tr>
@@ -145,16 +146,14 @@
 <script type="text/x-jsrender" id="traceTreeAllTmpl">
         <div class="row">
             <h5>
-                Transaction <strong>{{>traceId}}</strong> starts in <strong>{{>callIP}}</strong> at <strong>{{>startTimeStr}}</strong> and it cost <strong>{{>totalTime}}</strong> ms.
+                Trace <strong>{{>traceId}}</strong> starts in <strong>{{>callIP}}</strong> at <strong>{{>startTimeStr}}</strong> and it costs <strong>{{>totalTime}}</strong> ms.
                 <br/>
                 {{if totalSize > maxQueryNodeSize}}
-                  This chain node number of transaction great than the max query node size(<strong>{{>maxQueryNodeSize}}</strong>)，Only the entry node is displayed.
+                  The span number of trace is great than the max query node size(<strong>{{>maxQueryNodeSize}}</strong>)，Only the entry span is displayed.
                 {{else totalSize > maxShowNodeSize}}
-                  This transaction has <strong>{{>totalSize}}</strong> call chain node(s), but the number is great than then max number of showing node，Only the first <strong>{{>showSize}}</strong>
-                   are
-                  displayed.
+                  This trace has <strong>{{>totalSize}}</strong> spans, but the number is great than then max number of showing node，Only the first <strong>{{>showSize}}</strong> spans are displayed.
                 {{else}}
-                   This transaction has <strong>{{>totalSize}}</strong> call chain node(s).
+                   This trace has <strong>{{>totalSize}}</strong> span(s).
                 {{/if}}
                 </h5>
         </div>