diff --git a/css/style.css b/css/style.css
index 0e5d5a656..88b375844 100644
--- a/css/style.css
+++ b/css/style.css
@@ -603,4 +603,33 @@ margin-bottom:2px; width:100%;
 	#board-actions {
 		display:none !important;
 	}
+}
+
+#markdown p {
+	margin-bottom:15px;
+}
+#markdown ol,
+#markdown ul {
+	margin-left:20px;
+	list-style-type: disc;
+}
+#markdown h1 {
+	font-size:18px;
+	margin-bottom:5px;
+}
+#markdown h2 {
+	font-size:16px;
+}
+#markdown h3 {
+	font-size:14px;
+}
+#markdown h4 {
+	font-size:13px;
+}
+#markdown h6 {
+	font-size:12px;
+}
+#markdown pre {
+	background-color:#eeeeee;
+	padding:3px;
 }
\ No newline at end of file
diff --git a/js/app/Config.js b/js/app/Config.js
index 9221a5224..9a7720ed1 100644
--- a/js/app/Config.js
+++ b/js/app/Config.js
@@ -1,7 +1,16 @@
-app.config(function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider) {
+app.config(function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownProvider) {
     'use strict';
     $httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
 
+
+    markdownProvider.config({
+        simplifiedAutoLink: true,
+        strikethrough: true,
+        tables: true,
+        tasklists: true,
+
+    });
+
     $compileProvider.debugInfoEnabled(true);
 
     $urlRouterProvider.otherwise("/");
diff --git a/js/public/app.js b/js/public/app.js
index 2f4bab2ef..b4f22b362 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -28,10 +28,19 @@ var app = angular.module('Deck', [
 ]);
 
 
-app.config(["$provide", "$routeProvider", "$interpolateProvider", "$httpProvider", "$urlRouterProvider", "$stateProvider", "$compileProvider", function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider) {
+app.config(["$provide", "$routeProvider", "$interpolateProvider", "$httpProvider", "$urlRouterProvider", "$stateProvider", "$compileProvider", "markdownProvider", function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownProvider) {
     'use strict';
     $httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
 
+
+    markdownProvider.config({
+        simplifiedAutoLink: true,
+        strikethrough: true,
+        tables: true,
+        tasklists: true,
+
+    });
+
     $compileProvider.debugInfoEnabled(true);
 
     $urlRouterProvider.otherwise("/");
diff --git a/templates/part.card.php b/templates/part.card.php
index 40d5da0af..598dbb331 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -44,7 +44,7 @@
 <div id="card-description">
     <h3>Description</h3>
     <textarea elastic ng-if="status.description" placeholder="Enter your description here ..." ng-blur="updateCard(cardservice.getCurrent())" ng-model="cardservice.getCurrent().description" autofocus-on-insert> </textarea>
-    <div class="container" ng-click="editDescription()" ng-show="!status.description" ng-animate><div ng-bind-html="cardservice.getCurrent().description | markdown"></div><div class="placeholder" ng-if="!cardservice.getCurrent().description">Add a card description ...</div></div>
+    <div class="container" ng-click="editDescription()" ng-show="!status.description" ng-animate><div ng-bind-html="cardservice.getCurrent().description | markdown" id="markdown"></div><div class="placeholder" ng-if="!cardservice.getCurrent().description">Add a card description ...</div></div>
 
 </div>