diff --git a/public_html/css/post.css b/public_html/css/post.css
index dde83597..03f2a53f 100644
--- a/public_html/css/post.css
+++ b/public_html/css/post.css
@@ -204,7 +204,7 @@
 	top: 20%;
 }
 .post-note-edit textarea {
-	width: 20em;
+	width: 25em;
 	height: 5em;
 	display: block;
 }
diff --git a/public_html/js/Presenters/PostNotesPresenter.js b/public_html/js/Presenters/PostNotesPresenter.js
index 545be550..e5364910 100644
--- a/public_html/js/Presenters/PostNotesPresenter.js
+++ b/public_html/js/Presenters/PostNotesPresenter.js
@@ -86,6 +86,8 @@ App.Presenters.PostNotesPresenter = function(
 			removePostNote(postNote);
 		} else if (sender === 'save') {
 			savePostNote(postNote);
+		} else if (sender === 'preview') {
+			previewPostNote(postNote);
 		}
 	}
 
@@ -132,6 +134,20 @@ App.Presenters.PostNotesPresenter = function(
 		}
 	}
 
+	function previewPostNote(postNote) {
+		var previewText = $form.find('textarea').val();
+		postNote.$element.find('.text').html(util.formatMarkdown(previewText));
+		showPostNoteText(postNote);
+	}
+
+	function showPostNoteText(postNote) {
+		postNote.$element.find('.text-wrapper').show();
+	}
+
+	function hidePostNoteText(postNote) {
+		postNote.$element.find('.text-wrapper').css('display', '');
+	}
+
 	function postNoteClicked(e) {
 		e.preventDefault();
 		var $postNote = jQuery(e.currentTarget).parents('.post-note');
@@ -142,6 +158,7 @@ App.Presenters.PostNotesPresenter = function(
 	}
 
 	function showFormForPostNote($postNote) {
+		hideForm();
 		var postNote = $postNote.data('postNote');
 		$form.data('postNote', postNote);
 		$form.find('textarea').val(postNote.text);
@@ -150,6 +167,10 @@ App.Presenters.PostNotesPresenter = function(
 	}
 
 	function hideForm() {
+		var previousPostNote = $form.data('post-note');
+		if (previousPostNote) {
+			hidePostNoteText(previousPostNote);
+		}
 		$form.hide();
 	}
 
diff --git a/public_html/templates/post-notes.tpl b/public_html/templates/post-notes.tpl
index fe886500..3cc70dda 100644
--- a/public_html/templates/post-notes.tpl
+++ b/public_html/templates/post-notes.tpl
@@ -21,6 +21,7 @@
 	<div class="actions"><!--
 		--><% if (privileges.canEditPostNotes) { %><!--
 			--><button type="submit" name="sender" value="save">Save</button><!--
+			--><button type="submit" name="sender" value="preview">Preview</button><!--
 		--><% } %><!--
 		--><button type="submit" name="sender" value="cancel">Cancel</button><!--
 		--><% if (privileges.canDeletePostNotes) { %><!--