diff --git a/mailboxes/config b/mailboxes/config
index b7e89515a..64c192950 100644
--- a/mailboxes/config
+++ b/mailboxes/config
@@ -26,6 +26,7 @@ no_crlf=0
 sync_perms=0700
 show_mail=0
 html_edit=2
+html_edit_mode=advanced
 check_mod=1
 spam_buttons=mail
 show_delall=0
diff --git a/mailboxes/config.info b/mailboxes/config.info
index 5e6844298..7d55c5029 100644
--- a/mailboxes/config.info
+++ b/mailboxes/config.info
@@ -12,6 +12,7 @@ delete_warn=Ask for confirmation before deleting?,10,y-Yes,n-No,For mbox files l
 view_html=Show message body as,4,0-Always plain text,1-Text if possible, HTML otherwise,2-HTML if possible, text otherwise,3-Convert HTML to plain text
 view_images=Show inline images by default?,1,0-Yes, client fetched,3-Yes, server fetched,1-No external images,2-No
 html_edit=Use HTML editor for composing?,4,2-Always,1-When replying to HTML email,0-Never
+html_edit_mode=HTML editor toolbar mode?,4,basic-Basic,simple-Simple,advanced-Advanced,expert-Expert
 html_quote=HTML quoting mode,1,1-Message below <hr>,0-Message inside <blockquote>
 log_read=Record the reading of mail in the Webmin Actions Log?,1,1-Yes,0-No
 bcc_to=Bcc: sent messages to,0
diff --git a/mailboxes/prefs.info b/mailboxes/prefs.info
index 2332c2d9d..d3fba13fc 100644
--- a/mailboxes/prefs.info
+++ b/mailboxes/prefs.info
@@ -1 +1 @@
-allowed=wrap_width,wrap_compose,perpage,show_to,top_buttons,arrows,show_delall,show_sent,fwd_mode,delete_warn,delete_warn_free,view_html,html_edit,html_quote,log_read,show_body,open_mode,link_mode,date_fmt,date_tz_def,date_tz
\ No newline at end of file
+allowed=wrap_width,wrap_compose,perpage,show_to,top_buttons,arrows,show_delall,show_sent,fwd_mode,delete_warn,delete_warn_free,view_html,html_edit,html_edit_mode,html_quote,log_read,show_body,open_mode,link_mode,date_fmt,date_tz_def,date_tz
\ No newline at end of file
diff --git a/mailboxes/reply_mail.cgi b/mailboxes/reply_mail.cgi
index bfd4a4b3c..7df1125c0 100755
--- a/mailboxes/reply_mail.cgi
+++ b/mailboxes/reply_mail.cgi
@@ -450,7 +450,7 @@ $quote = &iframe_quote($quote);
 # Get HTML editor and replies
 my $html_editor = &html_editor(
       { textarea => 'body',
-      	type => 'advanced',
+      	type => $config{'html_edit_mode'} || 'advanced',
         quote => length($quote),
         after =>
            { editor => $quote }