diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 03c55e0972..1706202a2d 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1186,15 +1186,22 @@
 			<OptionPanel id    = "LoadSave"
 			             label = "${res:Dialog.Options.IDEOptions.LoadSaveOptions.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.LoadSaveOptions"/>
+			<!-- 
 			<OptionPanel id    = "TaskListOptions"
 			             label = "${res:Dialog.Options.IDEOptions.TaskListOptions.PanelName}"
-			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListOptions"/>
+			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListOptions"/>-->
+			
+			<OptionPanel id    = "TaskListOptions"
+			             label = "${res:Dialog.Options.IDEOptions.TaskListOptions.PanelName}"
+			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListXaml"/>
+			
 			<OptionPanel id    = "OutputWindowOptions"
 			             label = "${res:Dialog.Options.IDEOptions.OutputPanel.Title}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.OutputWindowOptionsPanel"/>
 			<OptionPanel id    = "ProjectAndSolutionOptions"
 			             label = "${res:Dialog.Options.IDEOptions.ProjectAndSolutionOptions.PanelName}"
 			             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ProjectAndSolutionOptions"/>
+		
 		</OptionPanel>
 		<OptionPanel id    = "CodingOptions"
 		             label = "${res:Dialog.Options.IDEOptions.CodingOptionsText}">
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 9c3971a46a..1d9cc6130c 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -249,6 +249,10 @@
       <DependentUpon>SelectCulturePanel.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListXaml.xaml.cs">
+      <DependentUpon>TaskListXaml.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\DebugOptions.xaml.cs">
       <DependentUpon>DebugOptions.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -874,6 +878,7 @@
   </ItemGroup>
   <ItemGroup>
     <Page Include="Src\Bookmarks\Pad\Controls\ListViewPad.xaml" />
+    <Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListXaml.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildEvents.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\DebugOptions.xaml" />
     <Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ProjectOptionPanel.xaml">
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListXaml.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListXaml.xaml
new file mode 100644
index 0000000000..7a446a4a80
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListXaml.xaml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gui:OptionPanel
+	x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.TaskListXaml"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
+	xmlns:sd="clr-namespace:ICSharpCode.SharpDevelop"
+	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui"
+	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels">
+	<GroupBox
+		Header="Comment Tags">
+		<Grid
+			Margin="5">
+			<Grid.RowDefinitions>
+				<RowDefinition
+					Height="30"></RowDefinition>
+				<RowDefinition
+					Height="30"></RowDefinition>
+				<RowDefinition
+					Height="20"></RowDefinition>
+				<RowDefinition
+					Height="30"></RowDefinition>
+				<RowDefinition
+					Height="30"></RowDefinition>
+				<RowDefinition
+					Height="30"></RowDefinition>
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition></ColumnDefinition>
+				<ColumnDefinition></ColumnDefinition>
+			</Grid.ColumnDefinitions>
+			<TextBlock
+				Text="Token List"></TextBlock>
+			<ListView
+				x:Name="listView"
+				Margin="5,0,5,5"
+				Grid.Row="1"
+				Grid.RowSpan="6"
+				SelectionChanged="ListView_SelectionChanged"></ListView>
+			<TextBlock
+				Text="Name"
+				Margin="5,0,0,0"
+				Grid.Column="1"></TextBlock>
+			<TextBox
+				x:Name="taskText"
+				Margin="5,0,5,0"
+				Grid.Column="1"
+				Grid.Row="1"></TextBox>
+			<Button
+				Content="Add"
+				Click="AddButton_Click"
+				Margin="5,2,5, 3"
+				Grid.Row="3"
+				Grid.Column="1"></Button>
+			<Button
+				x:Name="changeBtn"
+				Content="Change"
+				IsEnabled="False"
+				Click="ChangeBtn_Click"
+				Grid.Row="4"
+				Grid.Column="1"
+				Margin="5,3,5,3"></Button>
+			<Button
+				x:Name="removeBtn"
+				Click="RemoveBtn_Click"
+				Margin="5,2,5,5"
+				Content="Remove"
+				Grid.Row="5"
+				Grid.Column="1"
+				IsEnabled="False"></Button>
+		</Grid>
+	</GroupBox>
+</gui:OptionPanel>
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListXaml.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListXaml.xaml.cs
new file mode 100644
index 0000000000..ba00a5e8cc
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/TaskListXaml.xaml.cs
@@ -0,0 +1,92 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 26.02.2012
+ * Time: 19:46
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+
+using ICSharpCode.SharpDevelop.Gui;
+
+namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
+{
+	/// <summary>
+	/// Interaction logic for TaskListXaml.xaml
+	/// </summary>
+	public partial class TaskListXaml : OptionPanel
+	{
+		public TaskListXaml()
+		{
+			InitializeComponent();
+			string[] tokens = ParserService.TaskListTokens;
+			foreach (var token in tokens) {
+				listView.Items.Add(token);
+			};
+		}
+		
+		
+		void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+		{
+			if (listView.SelectedItem != null) {
+				taskText.Text = listView.SelectedItem.ToString();
+				changeBtn.IsEnabled = true;
+				removeBtn.IsEnabled = true;
+			}
+		}
+		
+		
+		void ChangeBtn_Click(object sender, RoutedEventArgs e)
+		{
+			if ((listView.SelectedItem != null) && (!String.IsNullOrWhiteSpace(taskText.Text))) {
+				var i = listView.Items.IndexOf(listView.SelectedItem);
+				listView.Items[i] =  taskText.Text;
+			}
+		}
+		
+		
+		void RemoveBtn_Click(object sender, RoutedEventArgs e)
+		{
+			if (listView.SelectedItem != null) {
+				listView.Items.Remove(listView.SelectedItem);
+				taskText.Text = String.Empty;
+			}
+		}
+		
+		
+		void AddButton_Click(object sender, RoutedEventArgs e)
+		{
+			if (!String.IsNullOrWhiteSpace(taskText.Text)) {
+				var i = listView.Items.IndexOf(taskText.Text);
+				if (i < 0) {
+					
+					listView.Items.Add(taskText.Text);
+				}
+			}
+		}
+		
+		
+		public override bool SaveOptions()
+		{
+			List<string> tokens = new List<string>();
+			
+			foreach (var item in listView.Items) {
+				string text = item.ToString().Trim();
+				if (text.Length > 0) {
+					tokens.Add(text);
+				}
+			}
+			ParserService.TaskListTokens = tokens.ToArray();
+			return true;
+		}
+	}
+}
\ No newline at end of file