Index: MonoRail/Castle.MonoRail.Framework.Tests/Services/EmailTemplateServiceTestCase.cs
===================================================================
--- MonoRail/Castle.MonoRail.Framework.Tests/Services/EmailTemplateServiceTestCase.cs	(revision 5773)
+++ MonoRail/Castle.MonoRail.Framework.Tests/Services/EmailTemplateServiceTestCase.cs	(working copy)
@@ -146,7 +146,7 @@
 				Assert.AreEqual("bcopied@noemail.com", message.Bcc);
 				Assert.AreEqual("contact@noemail.com", message.From);
 				Assert.AreEqual("Hello!", message.Subject);
-				Assert.AreEqual("\r\nThis is the\r\nbody\r\n", message.Body);
+				Assert.AreEqual("This is the\r\nbody\r\n", message.Body);
 				Assert.AreEqual(1, message.Headers.Count);
 			}
 		}
Index: MonoRail/Castle.MonoRail.Framework/Services/EmailTemplateService.cs
===================================================================
--- MonoRail/Castle.MonoRail.Framework/Services/EmailTemplateService.cs	(revision 5773)
+++ MonoRail/Castle.MonoRail.Framework/Services/EmailTemplateService.cs	(working copy)
@@ -229,12 +229,7 @@
 				}
 				else
 				{
-					if (!isInBody)
-					{
-						body.AppendLine(string.Empty);
-						isInBody = true;
-					}
-
+					isInBody = true;
 					body.AppendLine(line);
 				}
 			}