diff --git a/locales/de.json b/locales/de.json
index 9fdeeb22..73ffe0e6 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -62,6 +62,7 @@
 	"Refresh": "Neu laden",
 	"Contacts": "Kontakte",
 	"Report an issue": "Fehlerbericht senden",
+	"Meet us on Gitter": "Triff uns auf Gitter",
 	"Send us email": "Kontakt",
 	"Documents": "Dokumente",
 	"Features": "Funktionen",
diff --git a/locales/en.json b/locales/en.json
index 49e93a83..e6a966d7 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -62,6 +62,7 @@
 	"Refresh": "Refresh",
 	"Contacts": "Contacts",
 	"Report an issue": "Report an issue",
+	"Meet us on Gitter": "Meet us on Gitter",
 	"Send us email": "Send us email",
 	"Documents": "Documents",
 	"Features": "Features",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 97602c82..eeb01291 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -60,6 +60,7 @@
 	"Refresh": "重新整理",
 	"Contacts": "联络方式",
 	"Report an issue": "报告问题",
+	"Meet us on Gitter": "在 Gitter 上联系我们",
 	"Send us email": "寄信给我们",
 	"Documents": "文件",
 	"Features": "功能简介",
@@ -101,4 +102,4 @@
 	"OR": "或是",
 	"Export to Snippet": "导出到 Snippet",
 	"Select Visibility Level": "选择可见层级"
-}
\ No newline at end of file
+}
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index a3bb7774..c55758ab 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -60,6 +60,7 @@
 	"Refresh": "重新整理",
 	"Contacts": "聯絡方式",
 	"Report an issue": "回報問題",
+	"Meet us on Gitter": "透過 Gitter 聯絡我們",
 	"Send us email": "寄信給我們",
 	"Documents": "文件",
 	"Features": "功能簡介",
@@ -101,4 +102,4 @@
 	"OR": "或是",
 	"Export to Snippet": "匯出到 Snippet",
 	"Select Visibility Level": "選擇可見層級"
-}
\ No newline at end of file
+}
diff --git a/public/docs/features.md b/public/docs/features.md
index a894c087..01340fd7 100644
--- a/public/docs/features.md
+++ b/public/docs/features.md
@@ -3,13 +3,12 @@ Features
 
 Introduction
 ===
-<i class="fa fa-file-text"></i> **HackMD** is a realtime, multiplatform collaborative markdown note editor.
+<i class="fa fa-file-text"></i> **HackMD** is a realtime, multi-platform collaborative markdown note editor.
 This means that you can write notes with other people on your **desktop**, **tablet** or even on the **phone**.
-You can sign-in via **Facebook**, **Twitter**, **GitHub**, or **Dropbox** in the [_homepage_](/).
+You can sign-in via multiple auth providers like **Facebook**, **Twitter**, **GitHub** and many more on the [_homepage_](/).
 
-Note that this service is still in an early stage, and thus still has some [_issues_](https://github.com/hackmdio/hackmd/issues?q=is%3Aopen+is%3Aissue+label%3Abug).
-Please report new issues in [GitHub](https://github.com/hackmdio/hackmd/issues/new).
-If you need instant help, please send us a [Facebook message](https://www.messenger.com/t/hackmdio).
+If you experience any _issues_, feel free to report it on [**GitHub**](https://github.com/hackmdio/hackmd/issues).
+Or meet us on [**Gitter**](https://gitter.im/hackmdio/hackmd) for dev-talk and interactive help.
 **Thank you very much!**
 
 Workspace
@@ -137,7 +136,7 @@ alert(s);
 function $initHighlight(block, cls) {
   try {
     if (cls.search(/\bno\-highlight\b/) != -1)
-      return process(block, true, 0x0F) + 
+      return process(block, true, 0x0F) +
              ' class=""';
   } catch (e) {
     /* handle exception */
@@ -157,7 +156,7 @@ alert(s);
 function $initHighlight(block, cls) {
   try {
     if (cls.search(/\bno\-highlight\b/) != -1)
-      return process(block, true, 0x0F) + 
+      return process(block, true, 0x0F) +
              ' class=""';
   } catch (e) {
     /* handle exception */
@@ -259,7 +258,7 @@ cond(no)->op2
 digraph hierarchy {
 
                 nodesep=1.0 // increases the separation between nodes
-                
+
                 node [color=Red,fontname=Courier,shape=box] //All nodes will this shape and colour
                 edge [color=Blue, style=dashed] //All the lines look like this
 
@@ -386,7 +385,7 @@ Subscript: H~2~O
 
 > Blockquotes can also be nested...
 >> ...by using additional greater-than signs right next to each other...
-> > > ...or with spaces between arrows. 
+> > > ...or with spaces between arrows.
 
 
 ### Lists
diff --git a/public/views/shared/help-modal.ejs b/public/views/shared/help-modal.ejs
index b1ea681d..f5dc55c2 100644
--- a/public/views/shared/help-modal.ejs
+++ b/public/views/shared/help-modal.ejs
@@ -15,9 +15,9 @@
                                 <h3 class="panel-title"><%= __('Contacts') %></h3>
                             </div>
                             <div class="panel-body">
-                                <a href="https://github.com/hackmdio/hackmd/issues" target="_blank"><i class="fa fa-tag fa-fw"></i> <%= __('Report an issue') %></a> 
+                                <a href="https://github.com/hackmdio/hackmd/issues" target="_blank"><i class="fa fa-tag fa-fw"></i> <%= __('Report an issue') %></a>
                                 <br>
-                                <a href="mailto:hackmdio@gmail.com"><i class="fa fa-envelope fa-fw"></i> <%= __('Send us email') %></a>
+                                <a href="https://gitter.im/hackmdio/hackmd" target="_blank"><i class="fa fa-comments fa-fw"></i> <%= __('Meet us on Gitter') %></a>
                             </div>
                         </div>
                         <div class="panel panel-default">
@@ -144,4 +144,4 @@
         letter-spacing: 0.025em;
         line-height: 1.25;
     }
-</style>
\ No newline at end of file
+</style>