diff -r -U3 -bB ./bin/editonesection /home/intrafici/public_html/twiki/bin/editonesection
--- ./bin/editonesection	2005-03-12 09:13:16.000000000 +0100
+++ /home/intrafici/public_html/twiki/bin/editonesection	2005-03-16 10:56:06.069265000 +0100
@@ -72,10 +72,10 @@
 	}
     }
     
-    my $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($pretxt);
+    my $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($pretxt,1);
     $tmpl =~ s/%PRETEXTFIELD%/$tmptxt/go;
     $sectxt = &TWiki::Contrib::EditContrib::quoteForXml($sectxt);
-    $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($postxt);
+    $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($postxt,1);
     $tmpl =~ s/%POSTEXTFIELD%/$tmptxt/go;
     ##AS added hook for plugins that want to do heavy stuff
     TWiki::Plugins::beforeEditHandler( $sectxt, $topic, $webName );
diff -r -U3 -bB ./bin/editsection /home/intrafici/public_html/twiki/bin/editsection
--- ./bin/editsection	2005-03-12 09:12:02.000000000 +0100
+++ /home/intrafici/public_html/twiki/bin/editsection	2005-03-16 10:55:56.033122012 +0100
@@ -121,12 +121,12 @@
 	}
     }
     
-    my $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($pretxt);
+    my $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($pretxt,1);
     $tmpl =~ s/%PRETEXTFIELD%/$tmptxt/go;
     $pretxt = &TWiki::handleCommonTags( $pretxt, $topic );
     $pretxt = &TWiki::Render::getRenderedVersion( $pretxt );
     $sectxt = &TWiki::Contrib::EditContrib::quoteForXml($sectxt);
-    my $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($postxt);
+    my $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($postxt,1);
     $tmpl =~ s/%POSTEXTFIELD%/$tmptxt/go;
     $postxt = &TWiki::handleCommonTags( $postxt, $topic );
     $postxt = &TWiki::Render::getRenderedVersion( $postxt );
diff -r -U3 -bB ./bin/editthread /home/intrafici/public_html/twiki/bin/editthread
--- ./bin/editthread	2005-03-12 16:14:50.000000000 +0100
+++ /home/intrafici/public_html/twiki/bin/editthread	2005-03-16 10:55:33.936995476 +0100
@@ -83,10 +83,10 @@
       $sectxt = $TWiki::Plugins::ThreadedDiscussionPlugin::sectxt;
       $postxt = $TWiki::Plugins::ThreadedDiscussionPlugin::postxt . $sections[2];
 
-      my $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($pretxt);
+      my $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($pretxt,1);
       $tmpl =~ s/%PRETEXTFIELD%/$tmptxt/go;
       $sectxt = &TWiki::Contrib::EditContrib::quoteForXml($sectxt);
-      $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($postxt);
+      $tmptxt = &TWiki::Contrib::EditContrib::quoteForXml($postxt,1);
       $tmpl =~ s/%POSTEXTFIELD%/$tmptxt/go;
       ##AS added hook for plugins that want to do heavy stuff
       TWiki::Plugins::beforeEditHandler( $sectxt, $topic, $webName );
diff -r -U3 -bB ./lib/TWiki/Contrib/EditContrib.pm /home/intrafici/public_html/twiki/lib/TWiki/Contrib/EditContrib.pm
--- ./lib/TWiki/Contrib/EditContrib.pm	2005-03-13 15:06:08.000000000 +0100
+++ /home/intrafici/public_html/twiki/lib/TWiki/Contrib/EditContrib.pm	2005-03-16 11:03:46.964938322 +0100
@@ -37,7 +37,12 @@
   }
 
   # save called by preview
-  $query->param( -name=>"text", -value=>$query->param( 'pretxt' ) . $query->param( 'text' ) . $query->param( 'postxt' ));
+  my $pretxt = $query->param('pretxt');
+  my $postxt = $query->param('postxt');
+  $pretxt =~ s/%CR%/\n/go;
+  $postxt =~ s/%CR%/\n/go;
+  $query->param( -name=>"text", 
+		 -value=>$pretxt . $query->param( 'text' ) . $postxt);
   if ( TWiki::UI::Save::_save( $webName, $topic, $userName, $query )) {
     TWiki::redirect( $query, $redirecturl );
   }
@@ -94,12 +99,15 @@
 
 # =========================
 sub quoteForXml {
-    my ($text) = @_;
+    my ($text, $alsoCR) = @_;
     $text =~ s/&/&amp\;/go;
     $text =~ s/\"/"/g;
     $text =~ s/</&lt\;/go;
     $text =~ s/>/&gt\;/go;
     $text =~ s/\t/   /go;
+    if ($alsoCR) {
+	$text =~ s/\n/%CR%/go;
+    }
     return $text;
 }