Index: typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc
===================================================================
--- typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc	(revision 5485)
+++ typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc	(working copy)
@@ -1457,7 +1457,8 @@
 	}
 
 	/**
-	 * Actually sends the requested mails (through $this->cObj->sendNotifyEmail)
+	 * Actually sends the requested mails (through $this->cObj->sendNotifyEmail or through $this->sendHTMLMail).
+	 * As of TYPO3 v4.3 with autoloader, a check for $GLOBALS['TSFE']->config['config']['incT3Lib_htmlmail'] has been included for backwards compatibility.
 	 *
 	 * @param	string		Recipient email address (or list)
 	 * @param	string		Possible "admin" email address. Will enable sending of admin emails if also $adminContent is provided
@@ -1470,8 +1471,8 @@
 	function sendMail($recipient, $admin, $content='', $adminContent='')	{
 			// Admin mail:
 		if ($admin && $adminContent)	{
-			if (!$this->isHTMLContent($adminContent))	{
-				$admMail = $this->cObj->sendNotifyEmail($adminContent,
+			if (!$this->isHTMLContent($adminContent) || !$GLOBALS['TSFE']->config['config']['incT3Lib_htmlmail'])	{
+				$admMail = $this->cObj->sendNotifyEmail(strip_tags($adminContent),
 									$admin,
 									'',
 									$this->conf['email.']['from'],
@@ -1489,8 +1490,8 @@
 			}
 		}
 			// user mail:
-		if (!$this->isHTMLContent($content))	{
-			$this->cObj->sendNotifyEmail($content,
+		if (!$this->isHTMLContent($content) || !$GLOBALS['TSFE']->config['config']['incT3Lib_htmlmail'])	{
+			$this->cObj->sendNotifyEmail(strip_tags($content),
 								$recipient,
 								'',			// ($admMail ? '' : $admin), 		// If the special administration mail was not found and send, the regular is...
 								$this->conf['email.']['from'],
@@ -1521,7 +1522,6 @@
 
 	/**
 	 * Sending HTML email, using same parameters as tslib_cObj::sendNotifyEmail()
-	 * NOTICE: "t3lib_htmlmail" library must be included for this to work, otherwise an error message is outputted.
 	 *
 	 * @param	string		The message content. If blank, no email is sent.
 	 * @param	string		Comma list of recipient email addresses
@@ -1535,47 +1535,41 @@
 	 */
 	function sendHTMLMail($content,$recipient,$dummy,$fromEmail,$fromName,$replyTo='')	{
 		if (trim($recipient) && trim($content))	{
-			$cls=t3lib_div::makeInstanceClassName('t3lib_htmlmail');
-				// Avoid autoloading of t3lib_htmlmail, since it's only a strategy check here:
-			if (class_exists($cls, false))	{	// If htmlmail lib is included, then generate a nice HTML-email
-				$parts = spliti('<title>|</title>',$content,3);
-				$subject = trim($parts[1]) ? trim($parts[1]) : 'TYPO3 FE Admin message';
+			$parts = spliti('<title>|</title>',$content,3);
+			$subject = trim($parts[1]) ? trim($parts[1]) : 'TYPO3 FE Admin message';
 
-				$Typo3_htmlmail = t3lib_div::makeInstance('t3lib_htmlmail');
-				$Typo3_htmlmail->start();
-				$Typo3_htmlmail->useBase64();
+			$Typo3_htmlmail = t3lib_div::makeInstance('t3lib_htmlmail');
+			$Typo3_htmlmail->start();
+			$Typo3_htmlmail->useBase64();
 
-				$Typo3_htmlmail->subject = $subject;
-				$Typo3_htmlmail->from_email = $fromEmail;
-				$Typo3_htmlmail->from_name = $fromName;
-				$Typo3_htmlmail->replyto_email = $replyTo ? $replyTo : $fromEmail;
-				$Typo3_htmlmail->replyto_name = $replyTo ? '' : $fromName;
-				$Typo3_htmlmail->organisation = '';
-				$Typo3_htmlmail->priority = 3;
+			$Typo3_htmlmail->subject = $subject;
+			$Typo3_htmlmail->from_email = $fromEmail;
+			$Typo3_htmlmail->from_name = $fromName;
+			$Typo3_htmlmail->replyto_email = $replyTo ? $replyTo : $fromEmail;
+			$Typo3_htmlmail->replyto_name = $replyTo ? '' : $fromName;
+			$Typo3_htmlmail->organisation = '';
+			$Typo3_htmlmail->priority = 3;
 
-					// HTML
-				$Typo3_htmlmail->theParts['html']['content'] = $content;	// Fetches the content of the page
-				$Typo3_htmlmail->theParts['html']['path'] = '';
-				$Typo3_htmlmail->extractMediaLinks();
-				$Typo3_htmlmail->extractHyperLinks();
-				$Typo3_htmlmail->fetchHTMLMedia();
-				$Typo3_htmlmail->substMediaNamesInHTML(0);	// 0 = relative
-				$Typo3_htmlmail->substHREFsInHTML();
-				$Typo3_htmlmail->setHTML($Typo3_htmlmail->encodeMsg($Typo3_htmlmail->theParts['html']['content']));
+				// HTML
+			$Typo3_htmlmail->theParts['html']['content'] = $content;	// Fetches the content of the page
+			$Typo3_htmlmail->theParts['html']['path'] = '';
+			$Typo3_htmlmail->extractMediaLinks();
+			$Typo3_htmlmail->extractHyperLinks();
+			$Typo3_htmlmail->fetchHTMLMedia();
+			$Typo3_htmlmail->substMediaNamesInHTML(0);	// 0 = relative
+			$Typo3_htmlmail->substHREFsInHTML();
+			$Typo3_htmlmail->setHTML($Typo3_htmlmail->encodeMsg($Typo3_htmlmail->theParts['html']['content']));
 
-					// PLAIN
-				$Typo3_htmlmail->addPlain('');
+				// PLAIN
+			$Typo3_htmlmail->addPlain('');
 
-					// SET Headers and Content
-				$Typo3_htmlmail->setHeaders();
-				$Typo3_htmlmail->setContent();
-				$Typo3_htmlmail->setRecipient($recipient);
+				// SET Headers and Content
+			$Typo3_htmlmail->setHeaders();
+			$Typo3_htmlmail->setContent();
+			$Typo3_htmlmail->setRecipient($recipient);
 
-		//		debug($Typo3_htmlmail->theParts);
-				$Typo3_htmlmail->sendtheMail();
-			} else {
-				debug('SYSTEM ERROR: No HTML-mail library loaded. Set "page.config.incT3Lib_htmlmail = 1" is your TypoScript template.');
-			}
+	//		debug($Typo3_htmlmail->theParts);
+			$Typo3_htmlmail->sendtheMail();
 		}
 	}
 
Index: typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc
===================================================================
--- typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc	(revision 5485)
+++ typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc	(working copy)
@@ -141,9 +141,7 @@
 	function main_wapversion($content,$conf)	{
 		$GLOBALS['TSFE']->set_no_cache();
 
-
-		$className=t3lib_div::makeInstanceClassName('t3lib_xml');
-		$xmlObj = new $className('wml');
+		$xmlObj = t3lib_div::makeInstance('t3lib_xml', 'wml');
 		$xmlObj->XMLdebug=$conf['debug'];
 
 			// Creating top level object
Index: typo3/sysext/cms/tslib/media/scripts/xmlversionLib.inc
===================================================================
--- typo3/sysext/cms/tslib/media/scripts/xmlversionLib.inc	(revision 5485)
+++ typo3/sysext/cms/tslib/media/scripts/xmlversionLib.inc	(working copy)
@@ -105,8 +105,7 @@
 	 * @return	string		XML content
 	 */
 	function main_xmlversion($content,$conf)	{
-		$className=t3lib_div::makeInstanceClassName('t3lib_xml');
-		$xmlObj = new $className('typo3_page');
+		$xmlObj = t3lib_div::makeInstance('t3lib_xml', 'typo3_page');
 		$xmlObj->XMLdebug=0;
 		$xmlObj->setRecFields('pages','doktype,title,alias,hidden,starttime,endtime,fe_group,url,target,no_cache,shortcut,keywords,description,abstract,author,author_email,newUntil,lastUpdated,cache_timeout');
 		$xmlObj->setRecFields('tt_content','CType,header,header_link,bodytext,image,imagewidth,imageorient,media,records,colPos,starttime,endtime,fe_group');