Index: typo3/sysext/scheduler/mod1/locallang.xml
===================================================================
--- typo3/sysext/scheduler/mod1/locallang.xml	(revision 7428)
+++ typo3/sysext/scheduler/mod1/locallang.xml	(working copy)
@@ -64,6 +64,7 @@
 			<label index="msg.noEmail">Please enter an email address.</label>
 			<label index="msg.noFrequency">No frequency was defined, either as an interval or as a cron command.</label>
 			<label index="msg.noLastRun">The Scheduler has never yet run or the information about the last run has been lost.</label>
+			<label index="msg.noTasksDefined">There are currently no task classes available at all. To be able to create new tasks, you must either enable the samples provided by the Scheduler or install some other extension that relies on the Scheduler.</label>
 			<label index="msg.noTaskClassFound">The selected task class could not be found. You should probably contact the task's developers.</label>
 			<label index="msg.noTasks">No tasks defined yet.</label>
 			<label index="msg.notExecuted">Not executed: %s</label>
Index: typo3/sysext/scheduler/mod1/index.php
===================================================================
--- typo3/sysext/scheduler/mod1/index.php	(revision 7428)
+++ typo3/sysext/scheduler/mod1/index.php	(working copy)
@@ -449,50 +449,64 @@
 	}
 
 	/**
-	 * This method gathers information about all registered tasks and displays it
+	 * This method gathers information about all available tasks classes and displays it
 	 *
 	 * @return	string	HTML content to display
 	 */
 	protected function displayInfoScreen() {
+		$content = '';
 		$registeredClasses = self::getRegisteredClasses();
 
-			// Initialise table layout
-		$tableLayout = array (
-			'table' => array ('<table border="0" cellspacing="1" cellpadding="2" style="width:auto;">', '</table>'),
-			'0' => array (
-				'tr' => array('<tr class="bgColor2" valign="top">', '</tr>'),
-				'defCol' => array('<td class="cell">', '</td>')
-			),
-			'defRow' => array (
-				'tr' => array('<tr class="bgColor3-20">', '</tr>'),
-				'defCol' => array('<td class="cell">', '</td>')
-			)
-		);
-		$table = array();
-		$tr = 0;
+			// No classes available, display information message
+		if (count($registeredClasses) == 0) {
+				/** @var t3lib_FlashMessage $flashMessage */
+			$flashMessage = t3lib_div::makeInstance('t3lib_FlashMessage',
+				$GLOBALS['LANG']->getLL('msg.noTasksDefined'),
+				'',
+				t3lib_FlashMessage::INFO
+			);
+			$content .= $flashMessage->render();
 
-			// Header row
-		$table[$tr][] = $GLOBALS['LANG']->getLL('label.name');
-		$table[$tr][] = $GLOBALS['LANG']->getLL('label.extension');
-		$table[$tr][] = $GLOBALS['LANG']->getLL('label.description');
-		$table[$tr][] = '';
-		$tr++;
+			// Display the list of all available classes
+		} else {
+				// Initialise table layout
+			$tableLayout = array (
+				'table' => array ('<table border="0" cellspacing="1" cellpadding="2" style="width:auto;">', '</table>'),
+				'0' => array (
+					'tr' => array('<tr class="bgColor2" valign="top">', '</tr>'),
+					'defCol' => array('<td class="cell">', '</td>')
+				),
+				'defRow' => array (
+					'tr' => array('<tr class="bgColor3-20">', '</tr>'),
+					'defCol' => array('<td class="cell">', '</td>')
+				)
+			);
+			$table = array();
+			$tr = 0;
 
-			// Display information about each service
-		foreach ($registeredClasses as $class => $classInfo) {
-			$table[$tr][] = $classInfo['title'];
-			$table[$tr][] = $classInfo['extension'];
-			$table[$tr][] = $classInfo['description'];
-			$link = $GLOBALS['MCONF']['_'] . '&SET[function]=list&CMD=add&tx_scheduler[class]=' . $class;
-			$table[$tr][] = '<a href="' . htmlspecialchars($link) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:new', TRUE) . '"><img ' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/new_el.gif') . ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:new', TRUE) . '" /></a>';
+				// Header row
+			$table[$tr][] = $GLOBALS['LANG']->getLL('label.name');
+			$table[$tr][] = $GLOBALS['LANG']->getLL('label.extension');
+			$table[$tr][] = $GLOBALS['LANG']->getLL('label.description');
+			$table[$tr][] = '';
 			$tr++;
+
+				// Display information about each service
+			foreach ($registeredClasses as $class => $classInfo) {
+				$table[$tr][] = $classInfo['title'];
+				$table[$tr][] = $classInfo['extension'];
+				$table[$tr][] = $classInfo['description'];
+				$link = $GLOBALS['MCONF']['_'] . '&SET[function]=list&CMD=add&tx_scheduler[class]=' . $class;
+				$table[$tr][] = '<a href="' . htmlspecialchars($link) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:new', TRUE) . '"><img ' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/new_el.gif') . ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:new', TRUE) . '" /></a>';
+				$tr++;
+			}
+
+				// Render the table and return it
+			$content  = '<div>' . $GLOBALS['LANG']->getLL('msg.infoScreenIntro') . '</div>';
+			$content .= $this->doc->spacer(5);
+			$content .= $this->doc->table($table, $tableLayout);
 		}
 
-			// Render the table and return it
-		$content  = '<div>' . $GLOBALS['LANG']->getLL('msg.infoScreenIntro') . '</div>';
-		$content .= $this->doc->spacer(5);
-		$content .= $this->doc->table($table, $tableLayout);
-
 		return $content;
 	}
 
@@ -924,6 +938,9 @@
 		$dateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] . ' ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'];
 		$content = '';
 
+			// Get list of registered classes
+		$registeredClasses = self::getRegisteredClasses();
+
 			// Get all registered tasks
 		$query = array(
 			'SELECT'  => '*',
@@ -933,12 +950,16 @@
 
 		$res = $GLOBALS['TYPO3_DB']->exec_SELECT_queryArray($query);
 		$numRows = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
+			// No tasks defined, display information message
 		if ($numRows == 0) {
-			$content .= '<p>' . $GLOBALS['LANG']->getLL('msg.noTasks') . '</p>';
+				/** @var t3lib_FlashMessage $flashMessage */
+			$flashMessage = t3lib_div::makeInstance('t3lib_FlashMessage',
+				$GLOBALS['LANG']->getLL('msg.noTasks'),
+				'',
+				t3lib_FlashMessage::INFO
+			);
+			$content .= $flashMessage->render();
 		} else {
-				// Get list of registered classes
-			$registeredClasses = self::getRegisteredClasses();
-
 				// Load ExtJS framework and specific JS library
 				/** @var $pageRenderer t3lib_PageRenderer */
 			$pageRenderer = $this->doc->getPageRenderer();
@@ -1140,12 +1161,22 @@
 			$content .= '<input type="submit" class="button" name="go" value="' . $GLOBALS['LANG']->getLL('label.executeSelected') . '" />';
 		}
 
-			// Display add new task link
-		$link = $GLOBALS['MCONF']['_'] . '&CMD=add';
-		$content .= '<p><a href="' . htmlspecialchars($link) .'"><img '
-			. t3lib_iconWorks::skinImg($this->backPath, 'gfx/new_el.gif')
-			. ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:new', TRUE)
-			. '" /> ' . $GLOBALS['LANG']->getLL('action.add') . '</a></p>';
+		if (count($registeredClasses) > 0) {
+				// Display add new task link
+			$link = $GLOBALS['MCONF']['_'] . '&CMD=add';
+			$content .= '<p><a href="' . htmlspecialchars($link) .'"><img '
+				. t3lib_iconWorks::skinImg($this->backPath, 'gfx/new_el.gif')
+				. ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:new', TRUE)
+				. '" /> ' . $GLOBALS['LANG']->getLL('action.add') . '</a></p>';
+		} else {
+				/** @var t3lib_FlashMessage $flashMessage */
+			$flashMessage = t3lib_div::makeInstance('t3lib_FlashMessage',
+				$GLOBALS['LANG']->getLL('msg.noTasksDefined'),
+				'',
+				t3lib_FlashMessage::INFO
+			);
+			$content .= $flashMessage->render();
+		}
 
 			// Display legend, if there's at least one registered task
 			// Also display information about the usage of server time