diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 3929e66c8..359c52747 100755
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -1760,12 +1760,6 @@ class G
 
                         if (isset($aFields[$grdName]) && is_array($aFields[$grdName])) {
                             foreach ($aFields[$grdName] as $aRow) {
-                                foreach ($aRow as $sKey => $vValue) {
-                                    if (!is_array($vValue)) {
-                                        $aRow[$sKey] = nl2br($aRow[$sKey]);
-                                    }
-                                }
-
                                 $strData = $strData . G::replaceDataField($arrayMatch2[2], $aRow);
                             }
                         }
@@ -1784,12 +1778,6 @@ class G
 
         $sContent = $strContentAux;
 
-        foreach ($aFields as $sKey => $vValue) {
-            if (!is_array($vValue)) {
-                $aFields[$sKey] = nl2br($aFields[$sKey]);
-            }
-        }
-
         $sContent = G::replaceDataField($sContent, $aFields);
 
         return $sContent;
diff --git a/workflow/engine/classes/model/OutputDocument.php b/workflow/engine/classes/model/OutputDocument.php
index e2061789b..5c0b0c2e1 100755
--- a/workflow/engine/classes/model/OutputDocument.php
+++ b/workflow/engine/classes/model/OutputDocument.php
@@ -477,7 +477,7 @@ class OutputDocument extends BaseOutputDocument
     public function generate($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $sTypeDocToGener = 'BOTH', $aProperties = array())
     {
         if (($sUID != '') && is_array($aFields) && ($sPath != '')) {
-            $sContent = G::replaceDataGridField($sContent, $aFields);
+            $sContent = nl2br(G::replaceDataGridField($sContent, $aFields));
 
             G::verifyPath($sPath, true);