diff --git a/phpgwapi/inc/class.egw_ckeditor_config.inc.php b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
index 2f8f7c2aac..6810363b30 100644
--- a/phpgwapi/inc/class.egw_ckeditor_config.inc.php
+++ b/phpgwapi/inc/class.egw_ckeditor_config.inc.php
@@ -304,8 +304,10 @@ class egw_ckeditor_config
 	/**
 	 * @see get_ckeditor_config
 	 */
-	public static function get_ckeditor_config_array($mode = 'simple', $height = 400, $expanded_toolbar = true, $start_path = '')
+	public static function get_ckeditor_config_array($mode = '', $height = 400, $expanded_toolbar = true, $start_path = '')
 	{
+		// If not explicitly set, use preference for toolbar mode
+		if(!$mode || trim($mode) == '') $mode = $GLOBALS['egw_info']['user']['preferences']['common']['rte_features'];
 		$config = array();
 		$spellchecker_button = null;
 
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 8b76a68efb..3b5a06ef29 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -505,7 +505,7 @@ class html
 		{
 			return self::textarea($name,$content,'style="'.$style.'"');
 		}*/
-		return self::fckEditor($name, $content, ($style ? $style : 'extended'), array('toolbar_expanded' =>'true'), '400px', '100%', $base_href);
+		return self::fckEditor($name, $content, ($style ? $style : $GLOBALS['egw_info']['user']['preferences']['common']['rte_features']), array('toolbar_expanded' =>'true'), '400px', '100%', $base_href);
 	}
 
 	/**