--- sites/all/modules/webform_report/webform_report.inc	2011-03-23 10:45:59.000000000 -0400
+++ sites/all/modules/webform_report/webform_reportNew.inc	2011-03-23 10:44:33.000000000 -0400
@@ -1431,17 +1431,12 @@ function _webform_report_output_csv($hea
  */
 function _webform_report_format_csv_column($value, $delim) {
 
-  // if value contains a delimiter, it should be enclosed in quotes
-  if (strpos($value, $delim) !== FALSE) {
-      // if value contains quotes, double the quotes
-      if (strpos($value, '"')) {
-        return '"' . str_replace('"', '""', $value) . '"';
-      }
-      else {
-        return '"' . $value . '"';
-      }
-  }
-  return $value;
+  // Replace single quotes with double quotes, replace CRLF with LF
+  $value = str_replace(array('"', "\r\n"),
+                       array('""', "\n"),
+                       $value);
+
+  return '"' . $value . '"';
 }
 
 /**