-// Set empty mode to "select"
-if (!REQUEST_ISSET_GET('mode')) REQUEST_SET_GET('mode', "select");
+// mail_mode is not set by default
+if (!isGetRequestElementSet('mail_mode')) {
+ // Is HTML extension enabled?
+ if (isExtensionInstalled('html_mail')) {
+ // Set empty mode to 'select'
+ setGetRequestElement('mail_mode', 'select');
+ } else {
+ // Set empty mode to 'normal'
+ setGetRequestElement('mail_mode', 'normal');
+ }
+} // END - if