diff --git a/src/main/scala/view/Markdown.scala b/src/main/scala/view/Markdown.scala
index 4d998bd..c347d14 100644
--- a/src/main/scala/view/Markdown.scala
+++ b/src/main/scala/view/Markdown.scala
@@ -9,6 +9,7 @@
 import org.pegdown.LinkRenderer.Rendering
 import java.text.Normalizer
 import java.util.Locale
+import java.util.regex.Pattern
 import scala.collection.JavaConverters._
 import service.{RequestCache, WikiService}
 
@@ -149,4 +150,8 @@
     val noSpecialChars = StringUtil.urlEncode(normalized)
     noSpecialChars.toLowerCase(Locale.ENGLISH)
   }
+
+  def escapeTaskList(text: String): String = {
+    Pattern.compile("""^ *- \[([x| ])\] """, Pattern.MULTILINE).matcher(text).replaceAll("task:$1: ")
+  }
 }
diff --git a/src/test/scala/view/GitBucketHtmlSerializerSpec.scala b/src/test/scala/view/GitBucketHtmlSerializerSpec.scala
index 946b626..5b49c88 100644
--- a/src/test/scala/view/GitBucketHtmlSerializerSpec.scala
+++ b/src/test/scala/view/GitBucketHtmlSerializerSpec.scala
@@ -25,4 +25,69 @@
       after mustEqual "foo%21bar%40baz%3e9000"
     }
   }
+
+  "escapeTaskList" should {
+    "convert '- [ ] ' to 'task: :'" in {
+      val before = "- [ ] aaaa"
+      val after = escapeTaskList(before)
+      after mustEqual "task: : aaaa"
+    }
+
+    "convert '  - [ ] ' to 'task: :'" in {
+      val before = "  - [ ]   aaaa"
+      val after = escapeTaskList(before)
+      after mustEqual "task: :   aaaa"
+    }
+
+    "convert only first '- [ ] '" in {
+      val before = "   - [ ]   aaaa - [ ] bbb"
+      val after = escapeTaskList(before)
+      after mustEqual "task: :   aaaa - [ ] bbb"
+    }
+
+    "convert '- [x] ' to 'task: :'" in {
+      val before = "  - [x]   aaaa"
+      val after = escapeTaskList(before)
+      after mustEqual "task:x:   aaaa"
+    }
+
+    "convert multi lines" in {
+      val before = """
+tasks
+- [x] aaaa
+- [ ] bbb
+"""
+      val after = escapeTaskList(before)
+      after mustEqual """
+tasks
+task:x: aaaa
+task: : bbb
+"""
+    }
+
+    "no convert if inserted before '- [ ] '" in {
+      val before = " a  - [ ]   aaaa"
+      val after = escapeTaskList(before)
+      after mustEqual " a  - [ ]   aaaa"
+    }
+
+    "no convert '- [] '" in {
+      val before = "  - []   aaaa"
+      val after = escapeTaskList(before)
+      after mustEqual "  - []   aaaa"
+    }
+
+    "no convert '- [ ]a'" in {
+      val before = "  - [ ]a aaaa"
+      val after = escapeTaskList(before)
+      after mustEqual "  - [ ]a aaaa"
+    }
+
+    "no convert '-[ ] '" in {
+      val before = "  -[ ]   aaaa"
+      val after = escapeTaskList(before)
+      after mustEqual "  -[ ]   aaaa"
+    }
+  }
 }
+