diff -ru trunk.orig/typo3/alt_shortcut.php trunk.new/typo3/alt_shortcut.php
--- trunk.orig/typo3/alt_shortcut.php	2008-04-07 23:18:35.000000000 +0400
+++ trunk.new/typo3/alt_shortcut.php	2008-04-22 00:40:21.000000000 +0400
@@ -710,8 +710,8 @@
 
 		$selector = '';
 			// Preview:
-		if ($BE_USER->workspace!==0)	{
-			$selector.= '<label for="workspacePreview">Frontend Preview:</label> <input type="checkbox" name="workspacePreview" id="workspacePreview" onclick="changeWorkspacePreview('.($BE_USER->user['workspace_preview'] ? 0 : 1).')"; '.($BE_USER->user['workspace_preview'] ? 'checked="checked"' : '').'/>&nbsp;';
+		if ($BE_USER->workspace!==0 && $BE_USER->getTSConfigVal('options.hideFrontendPreview')!=1)	{
+			$selector.= '<label for="workspacePreview">'.$GLOBALS['LANG']->getLL('frontend_preview',1).'</label> <input type="checkbox" name="workspacePreview" id="workspacePreview" onclick="changeWorkspacePreview('.($BE_USER->user['workspace_preview'] ? 0 : 1).')"; '.($BE_USER->user['workspace_preview'] ? 'checked="checked"' : '').'/>&nbsp;';
 		}
 
 		$selector.= '<a href="mod/user/ws/index.php" target="content">'.
diff -ru trunk.orig/typo3/classes/class.workspaceselector.php trunk.new/typo3/classes/class.workspaceselector.php
--- trunk.orig/typo3/classes/class.workspaceselector.php	2008-04-07 23:07:28.000000000 +0400
+++ trunk.new/typo3/classes/class.workspaceselector.php	2008-04-22 00:40:09.000000000 +0400
@@ -164,8 +164,8 @@
 		}
 
 			// preview
-		if($GLOBALS['BE_USER']->workspace !== 0) {
-			$workspaceSelector.= ' <label for="workspacePreview">Frontend Preview:</label> <input type="checkbox" name="workspacePreview" id="workspacePreview" onclick="changeWorkspacePreview('.($GLOBALS['BE_USER']->user['workspace_preview'] ? 0 : 1).')"; '.($GLOBALS['BE_USER']->user['workspace_preview'] ? 'checked="checked"' : '').'/>';
+		if($GLOBALS['BE_USER']->workspace !== 0 && $GLOBALS['BE_USER']->getTSConfigVal('options.hideFrontendPreview')!=1) {
+			$workspaceSelector.= ' <label for="workspacePreview">'.$GLOBALS['LANG']->getLL('frontend_preview',1).'</label> <input type="checkbox" name="workspacePreview" id="workspacePreview" onclick="changeWorkspacePreview('.($GLOBALS['BE_USER']->user['workspace_preview'] ? 0 : 1).')"; '.($GLOBALS['BE_USER']->user['workspace_preview'] ? 'checked="checked"' : '').'/>';
 		}
 
 		$workspaceSelector.= ' <a href="mod/user/ws/index.php" target="content">'.