diff --git a/module/bug/model.php b/module/bug/model.php
index 100ff52e7f..fec11d38a3 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -93,7 +93,7 @@ class bugModel extends model
             $bug->project     = $data->projects[$i] ? $data->projects[$i] : 0;
             $bug->openedBuild = implode(',', $data->openedBuilds[$i]);
             $bug->title       = $data->titles[$i];
-            $bug->steps       = str_replace(array("\r\n", "\n"), '<br />', htmlspecialchars($data->stepses[$i]));
+            $bug->steps       = nl2br(htmlspecialchars($data->stepses[$i]));
             $bug->type        = $data->types[$i];
             $bug->severity    = $data->severities[$i];
             $bug->os          = $data->oses[$i];
diff --git a/module/mail/view/test.html.php b/module/mail/view/test.html.php
index 710bf0dd17..d32ce8b2fd 100755
--- a/module/mail/view/test.html.php
+++ b/module/mail/view/test.html.php
@@ -12,7 +12,7 @@
 if(isset($error))
 {
     include '../../common/view/header.lite.html.php';
-    die("<br />" . str_replace('\n', "<br />", join('', $error)));
+    die("<br />" . nl2br(join('', $error)));
 }
 ?>
 
diff --git a/module/story/model.php b/module/story/model.php
index 12c0284685..0d8ed7f9d7 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -227,7 +227,7 @@ class storyModel extends model
                 $specData[$i]->story   = $storyID;
                 $specData[$i]->version = 1;
                 $specData[$i]->title   = htmlspecialchars($stories->title[$i]);
-                if($stories->spec[$i] != '') $specData[$i]->spec = str_replace(array("\r\n", "\n"), '<br />', htmlspecialchars($stories->spec[$i]));
+                if($stories->spec[$i] != '') $specData[$i]->spec = nl2br(htmlspecialchars($stories->spec[$i]));
                 $this->dao->insert(TABLE_STORYSPEC)->data($specData[$i])->exec();
 
                 $this->loadModel('action');
diff --git a/module/task/model.php b/module/task/model.php
index 08041f40c2..08c973ca59 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -112,7 +112,7 @@ class taskModel extends model
             $data[$i]->module       = $tasks->module[$i]     == 'ditto' ? (isset($data[$i-1]) ? $data[$i-1]->module     : 0) : $tasks->module[$i];
             $data[$i]->assignedTo   = $tasks->assignedTo[$i] == 'ditto' ? (isset($data[$i-1]) ? $data[$i-1]->assignedTo : 0) : $tasks->assignedTo[$i];
             $data[$i]->name         = htmlspecialchars($tasks->name[$i]);
-            $data[$i]->desc         = str_replace(array("\r\n", "\n"), '<br />', htmlspecialchars($tasks->desc[$i]));
+            $data[$i]->desc         = nl2br(htmlspecialchars($tasks->desc[$i]));
             $data[$i]->pri          = $tasks->pri[$i];
             $data[$i]->estimate     = $tasks->estimate[$i];
             $data[$i]->left         = $tasks->estimate[$i];