From 4a554a65cddab0dd0e2c99592f1b94e793837dab Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 27 Apr 2015 13:44:19 +0000
Subject: [PATCH] Fix htmlarea editor always wrap border around editing text in
 IE

---
 etemplate/inc/class.etemplate_widget_htmlarea.inc.php | 2 +-
 mail/inc/class.mail_compose.inc.php                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_htmlarea.inc.php b/etemplate/inc/class.etemplate_widget_htmlarea.inc.php
index 7bb73f6374..0ca46a06de 100644
--- a/etemplate/inc/class.etemplate_widget_htmlarea.inc.php
+++ b/etemplate/inc/class.etemplate_widget_htmlarea.inc.php
@@ -38,7 +38,7 @@ class etemplate_widget_htmlarea extends etemplate_widget
 		// User preferences
 		$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 		$font_size = egw_ckeditor_config::font_size_from_prefs();
-		$font_span = '<span style="width: 100%; display: inline-block; '.
+		$font_span = '<span style="width: 100%; display: inline; '.
 			($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').
 			'">&#8203;</span>';
 		if (empty($font) && empty($font_size)) $font_span = '';
diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index ea94a94107..dd3f152259 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -1043,7 +1043,7 @@ class mail_compose
 			// User preferences for style
 			$font = $GLOBALS['egw_info']['user']['preferences']['common']['rte_font'];
 			$font_size = egw_ckeditor_config::font_size_from_prefs();
-			$font_part = '<span style="width:100%; display: inline-block; '.($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'">';
+			$font_part = '<span style="width:100%; display: inline; '.($font?'font-family:'.$font.'; ':'').($font_size?'font-size:'.$font_size.'; ':'').'">';
 			$font_span = $font_part.'&#8203;</span>';
 			if (empty($font) && empty($font_size)) $font_span = '';
 		}