diff --git a/ChangeLog b/ChangeLog
index 5196dd629..4b7a88454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-15  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/ckeditor/config.js: Changed the default
+	enter mode to use BR instead of P. This matches the behavior of Thunderbird.
+
 2011-04-14  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxContactEditor.js
diff --git a/UI/WebServerResources/ckeditor/config.js b/UI/WebServerResources/ckeditor/config.js
index 7d8f793d9..c54877e3e 100644
--- a/UI/WebServerResources/ckeditor/config.js
+++ b/UI/WebServerResources/ckeditor/config.js
@@ -9,4 +9,5 @@ CKEDITOR.editorConfig = function( config )
     config.skin = 'kama';
     config.removePlugins = "elementspath,maximize,resize";
     config.scayt_autoStartup = false;
+    config.enterMode = CKEDITOR.ENTER_BR;
 };