Index: typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc
===================================================================
--- typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc	(revision 5470)
+++ typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc	(working copy)
@@ -1521,7 +1521,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,13 +1534,11 @@
 	 */
 	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
+			$Typo3_htmlmail = t3lib_div::makeInstance('t3lib_htmlmail');
+			if (is_object($Typo3_htmlmail))	{
 				$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();
 
@@ -1574,7 +1571,7 @@
 		//		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('SYSTEM ERROR: E-Mail with HTML content could be sent as no HTML-mail object could be loaded');
 			}
 		}
 	}
Index: typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc
===================================================================
--- typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc	(revision 5470)
+++ 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 5470)
+++ 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');