diff --git a/src/public/js/angularjs/controllers/singleTicket.js b/src/public/js/angularjs/controllers/singleTicket.js
index 6ff7f7138..f7a3e8f22 100644
--- a/src/public/js/angularjs/controllers/singleTicket.js
+++ b/src/public/js/angularjs/controllers/singleTicket.js
@@ -228,7 +228,7 @@ define(['angular', 'underscore', 'jquery', 'uikit', 'modules/socket', 'modules/n
                     var form = $('form#edit-issue-form');
                     if (!form.isValid(null, null, false)) return true;
                     var issue = form.find('textarea#issueText').val();
-                    issue = '<p>' + issue + '</p>';
+
                     socket.ui.setTicketIssue(id, issue);
                 }
             };
diff --git a/src/public/js/pages/singleTicket.js b/src/public/js/pages/singleTicket.js
index 96dfd7a6b..84983ed5e 100644
--- a/src/public/js/pages/singleTicket.js
+++ b/src/public/js/pages/singleTicket.js
@@ -77,7 +77,6 @@ define('pages/singleTicket', [
                     if (id.length > 0) {
                         var comment = $($event.currentTarget).find('textarea#commentText').val();
                         var commentId = $($event.currentTarget).attr('data-commentId');
-                        comment = '<p>' + comment + '</p>';
 
                         socketClient.ui.setCommentText(id, commentId, comment);
                     }
@@ -112,7 +111,6 @@ define('pages/singleTicket', [
                     if (id.length > 0) {
                         var note = $($event.currentTarget).find('textarea#noteText').val();
                         var noteId = $($event.currentTarget).attr('data-noteId');
-                        note = '<p>' + note + '</p>';
 
                         socketClient.ui.setNoteText(id, noteId, note);
                     }
diff --git a/src/socketserver.js b/src/socketserver.js
index 87d258edb..388f6c45a 100644
--- a/src/socketserver.js
+++ b/src/socketserver.js
@@ -412,7 +412,10 @@ var socketServer = function(ws) {
             var ownerId = socket.request.user._id;
             var ticketSchema = require('./models/ticket');
             if (_.isUndefined(ticketId) || _.isUndefined(issue)) return true;
-            issue = issue.replace(/(\r\n|\n\r|\r|\n)/g, '<br>');
+
+            marked.setOptions({
+                breaks: true
+            });
             var markedIssue = marked(issue);
 
             ticketSchema.getTicketById(ticketId, function(err, ticket) {
@@ -438,7 +441,11 @@ var socketServer = function(ws) {
             var comment = data.commentText;
             var ticketSchema = require('./models/ticket');
             if (_.isUndefined(ticketId) || _.isUndefined(commentId) || _.isUndefined(comment)) return true;
-            comment = comment.replace(/(\r\n|\n\r|\r|\n)/g, '<br>');
+
+            marked.setOptions({
+                breaks: true
+            });
+
             var markedComment = marked(comment);
 
             ticketSchema.getTicketById(ticketId, function(err, ticket) {
@@ -485,7 +492,10 @@ var socketServer = function(ws) {
             var note = data.noteText;
             var ticketSchema = require('./models/ticket');
             if (_.isUndefined(ticketId) || _.isUndefined(noteId) || _.isUndefined(note)) return true;
-            note = note.replace(/(\r\n|\n\r|\r|\n)/g, '<br>');
+
+            marked.setOptions({
+                breaks: true
+            });
             var markedNote = marked(note);
 
             ticketSchema.getTicketById(ticketId, function(err, ticket) {