diff --git a/seahub/message/templates/message/user_msg_list.html b/seahub/message/templates/message/user_msg_list.html
index df72d1044f..59d59cef4d 100644
--- a/seahub/message/templates/message/user_msg_list.html
+++ b/seahub/message/templates/message/user_msg_list.html
@@ -99,7 +99,6 @@
     {% endif %}
 </div>
 
-{% include 'snippets/add_to_contacts_form.html' %}
 {% endblock %}
 
 {% block extra_script %}{{block.super}}
@@ -280,6 +279,4 @@ $('.msg-main .op', context).hover(
 bind_del($('.msg'));
 </script>
 
-{% include 'snippets/add_to_contacts_js.html' %}
-
 {% endblock %}
diff --git a/seahub/profile/templates/profile/user_profile.html b/seahub/profile/templates/profile/user_profile.html
index 00e518fffc..61b30e0586 100644
--- a/seahub/profile/templates/profile/user_profile.html
+++ b/seahub/profile/templates/profile/user_profile.html
@@ -23,11 +23,6 @@
     {% avatar "" 80 %}
     {% endif %}
 </div>
-
-{% if user %}
-<button id="send-msg" class="w100">{% trans "Send message" %}</button>
-{% endif %}
-
 {% endblock %}
 
 {% block right_panel %}
@@ -53,10 +48,5 @@
 
 {% block extra_script %}
 <script type="text/javascript">
-{% if user %}
-$('#send-msg').click(function() {
-    location.href = "{% url 'user_msg_list' username_or_id %}";
-});
-{% endif %}
 </script>
 {% endblock %}
diff --git a/seahub/templates/home_base.html b/seahub/templates/home_base.html
index 338e8ca099..549c2e2237 100644
--- a/seahub/templates/home_base.html
+++ b/seahub/templates/home_base.html
@@ -21,7 +21,6 @@
         <li class="tab {% block cur_personal_wiki %}{% endblock %}"><a href="{% url 'personal_wiki' %}" class="wiki">{% trans "Personal Wiki" %}</a></li>
         {% endif %}
         {% endfor %}
-        <li class="tab {% block cur_messages %}{% endblock %}"><a href="{% url 'message_list' %}" class="msgs">{% trans "Messages" %}</a></li>
         <li class="tab {% block cur_devices %}{% endblock %}"><a href="{% url 'devices' %}" class="clients">{% trans "Devices" %}</a></li>
     </ul>
 
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 430737db08..aadec58b8f 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -518,7 +518,6 @@
             <% } %>
         <% } %>
 
-        <li class="tab"><a href="{{ SITE_ROOT }}message/list/" class="msgs">{% trans "Messages" %}</a></li>
         <li class="tab"><a href="{{ SITE_ROOT }}devices/" class="clients">{% trans "Devices" %}</a></li>
     </ul>