Index: typo3/sysext/scheduler/mod1/index.php
===================================================================
--- typo3/sysext/scheduler/mod1/index.php	(revision 7360)
+++ typo3/sysext/scheduler/mod1/index.php	(working copy)
@@ -924,6 +924,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'  => '*',
@@ -934,11 +937,14 @@
 		$res = $GLOBALS['TYPO3_DB']->exec_SELECT_queryArray($query);
 		$numRows = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
 		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 +1146,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
Index: typo3/sysext/scheduler/mod1/locallang.xml
===================================================================
--- typo3/sysext/scheduler/mod1/locallang.xml	(revision 7360)
+++ 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 no classes yet defined. Therefore no task can be created.</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>