--- deliantra/server/common/player.C	2008/09/08 11:27:24	1.41
+++ deliantra/server/common/player.C	2008/09/08 11:30:53	1.42
@@ -330,19 +330,23 @@
           buf << "&lt;";
           break;
 
+        case '\r':
+          buf << '\n';
+          break;
+
         case '\n':
           if (*cfpod == ' ')
             goto passthrough;
           else if (*cfpod == '\n')
             {
               --cfpod;
-              while (*cfpod == '\n')
+              do
                 buf << *cfpod++;
-
-              goto skip;
+              while (*cfpod == '\n');
             }
+          else
+            buf << ' ';
 
-          buf << ' ';
           break;
 
         case 'B': case 'C': case 'E': case 'G':