From 264c1ff06092647a2965f3204b10c4c3d1fb7693 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 15 Apr 2011 19:24:49 +0000
Subject: [PATCH] See ChangeLog.

Monotone-Parent: e58e01ba23d307338c0721fcb30c8c45fb1a15f4
Monotone-Revision: 79d4612ae4a95206d934814a5aef8dd0eb18b3a5

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-04-15T19:24:49
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                | 5 +++++
 UI/WebServerResources/ckeditor/config.js | 1 +
 2 files changed, 6 insertions(+)

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;
 };