diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee
index 4c98ba3e..d8d0b37f 100644
--- a/app/coffee/modules/issues/detail.coffee
+++ b/app/coffee/modules/issues/detail.coffee
@@ -534,13 +534,41 @@ module.directive("tgComment", CommentDirective)
 ## WYSIWYG markitup editor directive
 #############################################################################
 
+#TODO: fix when i18n is implemented
 $i18next = {t: (key) -> key}
 
-tgMarkitupDirective = ($rootscope) ->
+tgMarkitupDirective = ($rootscope, $rs) ->
+    previewTemplate = _.template("""
+      <div class="preview">
+          <div class="actions">
+              <a href="#" title="Edit">Edit</a>
+          </div>
+          <div class="content">
+              <%= data %>
+          </div>
+      </div>
+    """)
+
     link = ($scope, $el, $attrs, $model) ->
+        element = angular.element($el)
+        previewDomNode = $("<div/>", {class: "preview"})
+
         openHelp = () ->
             window.open($rootscope.urls.wikiHelpUrl(), '_blank')
 
+        preview = () ->
+            markdownDomNode = element.parents(".markdown")
+            markItUpDomNode = element.parents(".markItUp")
+            $rs.mdrender.render($scope.projectId, $model.$modelValue).then (data) ->
+                markdownDomNode.append(previewTemplate({data: data.data}))
+                markItUpDomNode.hide()
+
+                element.parents(".markdown").one "click", ".preview", (event) ->
+                    event.preventDefault()
+                    markdownDomNode.find(".preview").remove()
+                    markItUpDomNode.show()
+
+
         markdownSettings =
             nameSpace: 'markdown'
             onShiftEnter: {keepDefault:false, openWith:'\n\n'}
@@ -625,11 +653,11 @@ tgMarkitupDirective = ($rootscope) ->
                 {
                     separator: '---------------'
                 },
-                # {
-                #     name: $i18next.t('wiki-editor.preview')
-                #     call: preview
-                #     className: "preview-icon"
-                # },
+                {
+                    name: $i18next.t('wiki-editor.preview')
+                    call: preview
+                    className: "preview-icon"
+                },
                 # {
                 #     separator: '---------------'
                 # },
@@ -652,7 +680,6 @@ tgMarkitupDirective = ($rootscope) ->
 
             return '\n'+heading+'\n'
 
-        element = angular.element($el)
         element.markItUp(markdownSettings)
 
         element.on "keypress", (event) ->
@@ -663,4 +690,4 @@ tgMarkitupDirective = ($rootscope) ->
 
     return {link:link, require:"ngModel"}
 
-module.directive("tgMarkitup", ["$rootScope", tgMarkitupDirective])
+module.directive("tgMarkitup", ["$rootScope", "$tgResources", tgMarkitupDirective])
diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade
index 163256a7..5b26bc19 100644
--- a/app/partials/issues-detail.jade
+++ b/app/partials/issues-detail.jade
@@ -27,7 +27,7 @@ block content
 
                 div.user-story-tags(tg-tag-line, ng-model="issue.tags")
 
-            section.us-content(tg-bind-html="issue.description_html")
+            section.us-content.wysiwyg(tg-bind-html="issue.description_html")
 
             // include views/modules/attachments
             section.us-activity