diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/SnippetOptionPanel.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/SnippetOptionPanel.xaml
index 698428dafb..8c692f03a2 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/SnippetOptionPanel.xaml
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/SnippetOptionPanel.xaml
@@ -6,15 +6,13 @@
 			<RowDefinition
 				Height="Auto" />
 			<RowDefinition
-				Height="1*" />
+				Height="2*" MinHeight="120" />
 			<RowDefinition
-				Height="1*" />
+				Height="1*" MinHeight="80" />
 		</Grid.RowDefinitions>
 		<Grid
 			Grid.Column="0"
-			Grid.Row="0"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top">
+			Grid.Row="0">
 			<Grid.RowDefinitions>
 				<RowDefinition
 					Height="Auto" />
@@ -37,6 +35,7 @@
 				DisplayMemberPath="Extensions"
 				Grid.Column="1"
 				Grid.Row="0"
+				Margin="0,0,4,0"
 				Height="23" />
 			<StackPanel
 				Grid.Column="0"
@@ -88,35 +87,39 @@
 					Padding="9,1,9,1"
 					Click="RemoveSnippetButton_Click" />
 			</StackPanel>-->
-		<DataGrid
+		<core:RestrictDesiredSize
 			Grid.Row="1"
-			Grid.Column="0"
-			x:Name="dataGrid"
-			SelectionMode="Single"
-			CanUserAddRows="True"
-			CanUserDeleteRows="True"
-			SelectionUnit="FullRow"
-			HeadersVisibility="Column"
-			CanUserResizeRows="False"
-			AutoGenerateColumns="False"
-			ItemsSource="{Binding ElementName=extensionComboBox, Path=SelectedItem.Snippets}"
-			SelectionChanged="DataGrid_SelectionChanged">
-			<DataGrid.Columns>
-				<DataGridTextColumn
-					Header="{core:Localize Dialog.Options.CodeTemplate.Template}"
-					Binding="{Binding Name}" />
-				<DataGridTextColumn
-					Header="{core:Localize Dialog.Options.CodeTemplate.Description}"
-					Width="*"
-					Binding="{Binding Description}" />
-			</DataGrid.Columns>
-		</DataGrid>
+			Grid.Column="0">
+			<DataGrid
+				x:Name="dataGrid"
+				SelectionMode="Single"
+				CanUserAddRows="True"
+				CanUserDeleteRows="True"
+				SelectionUnit="FullRow"
+				HeadersVisibility="Column"
+				CanUserResizeRows="False"
+				AutoGenerateColumns="False"
+				ItemsSource="{Binding ElementName=extensionComboBox, Path=SelectedItem.Snippets}"
+				SelectionChanged="DataGrid_SelectionChanged">
+				<DataGrid.Columns>
+					<DataGridTextColumn
+						Header="{core:Localize Dialog.Options.CodeTemplate.Template}"
+						Binding="{Binding Name}" />
+					<DataGridTextColumn
+						Header="{core:Localize Dialog.Options.CodeTemplate.Description}"
+						Width="*"
+						Binding="{Binding Description}" />
+				</DataGrid.Columns>
+			</DataGrid>
+		</core:RestrictDesiredSize>
 		<!--</DockPanel>-->
-		<AvalonEdit:TextEditor
-			x:Name="snippetTextBox"
+		<core:RestrictDesiredSize
 			Grid.Column="0"
-			Grid.Row="2"
-			FontFamily="Consolas, Courier New"
-			TextChanged="SnippetTextBox_TextChanged"/>
+			Grid.Row="2">
+			<AvalonEdit:TextEditor
+				x:Name="snippetTextBox"
+				FontFamily="Consolas, Courier New"
+				TextChanged="SnippetTextBox_TextChanged"/>
+		</core:RestrictDesiredSize>
 	</Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingManager.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingManager.cs
index e9b8dd0711..06a99adc92 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingManager.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingManager.cs
@@ -164,7 +164,7 @@ namespace ICSharpCode.AvalonEdit.Folding
 		}
 		
 		/// <summary>
-		/// Gets all foldings that contain <param name="offset" />.
+		/// Gets all foldings that contain <paramref name="offset" />.
 		/// </summary>
 		public ReadOnlyCollection<FoldingSection> GetFoldingsContaining(int offset)
 		{
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 7ac2b650f7..c038e117d0 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -351,9 +351,6 @@
     <Compile Include="Src\Gui\Dialogs\WordCountDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Src\Gui\Dialogs\OptionPanels\EditTemplateDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ExternalToolPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -550,7 +547,6 @@
     <EmbeddedResource Include="Resources\CommonAboutDialog.xfrm" />
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <EmbeddedResource Include="Resources\EditStandardHeaderPanel.xfrm" />
-    <EmbeddedResource Include="Resources\EditTemplateDialog.xfrm" />
     <EmbeddedResource Include="Resources\ExternalToolOptions.xfrm" />
     <EmbeddedResource Include="Resources\FontSelectionPanel.xfrm" />
     <EmbeddedResource Include="Resources\NewFileWithNameDialog.xfrm" />
diff --git a/src/Main/Base/Project/Resources/EditTemplateDialog.xfrm b/src/Main/Base/Project/Resources/EditTemplateDialog.xfrm
deleted file mode 100644
index be6138b2e7..0000000000
--- a/src/Main/Base/Project/Resources/EditTemplateDialog.xfrm
+++ /dev/null
@@ -1,67 +0,0 @@
-<Components version="1.0">
-  <System.Windows.Forms.Form>
-    <Name value="MyForm" />
-    <ShowInTaskbar value="False" />
-    <FormBorderStyle value="FixedDialog" />
-    <StartPosition value="CenterParent" />
-    <ClientSize value="{Width=338, Height=100}" />
-    <MinimizeBox value="False" />
-    <DockPadding value="" />
-    <Text value="${res:Dialog.Options.CodeTemplate.EditTemplateDialog.DialogName}" />
-    <AcceptButton value="okButton [System.Windows.Forms.Button], Text: ${res:Global.OKButtonText}" />
-    <CancelButton value="cancelButton [System.Windows.Forms.Button], Text: ${res:Global.CancelButtonText}" />
-    <MaximizeBox value="False" />
-    <Controls>
-      <System.Windows.Forms.Button>
-        <Name value="okButton" />
-        <Location value="{X=173,Y=71}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Global.OKButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="4" />
-        <DialogResult value="OK" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.Button>
-        <Name value="cancelButton" />
-        <Location value="{X=253,Y=71}" />
-        <ClientSize value="{Width=75, Height=23}" />
-        <Text value="${res:Global.CancelButtonText}" />
-        <Anchor value="Bottom, Right" />
-        <TabIndex value="5" />
-        <DialogResult value="Cancel" />
-      </System.Windows.Forms.Button>
-      <System.Windows.Forms.TextBox>
-        <Name value="descriptionTextBox" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="3" />
-        <Location value="{X=112,Y=38}" />
-        <ClientSize value="{Width=212, Height=17}" />
-        <Text value="" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="descriptionLabel" />
-        <Text value="${res:Dialog.Options.CodeTemplate.EditTemplateDialog.DescriptionLabel}" />
-        <TextAlign value="MiddleRight" />
-        <TabIndex value="2" />
-        <ClientSize value="{Width=100, Height=21}" />
-        <Location value="{X=8,Y=38}" />
-      </System.Windows.Forms.Label>
-      <System.Windows.Forms.TextBox>
-        <Name value="templateTextBox" />
-        <Anchor value="Top, Left, Right" />
-        <TabIndex value="1" />
-        <Location value="{X=112,Y=8}" />
-        <ClientSize value="{Width=212, Height=17}" />
-        <Text value="" />
-      </System.Windows.Forms.TextBox>
-      <System.Windows.Forms.Label>
-        <Name value="templateLabel" />
-        <Text value="${res:Dialog.Options.CodeTemplate.EditTemplateDialog.TemplateLabel}" />
-        <TextAlign value="MiddleRight" />
-        <TabIndex value="0" />
-        <ClientSize value="{Width=100, Height=21}" />
-        <Location value="{X=8,Y=8}" />
-      </System.Windows.Forms.Label>
-    </Controls>
-  </System.Windows.Forms.Form>
-</Components>
\ No newline at end of file
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
deleted file mode 100644
index 5fc060a64e..0000000000
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
-//     <version>$Revision$</version>
-// </file>
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-using ICSharpCode.SharpDevelop.Gui.XmlForms;
-using ICSharpCode.SharpDevelop.Internal.Templates;
-
-namespace ICSharpCode.SharpDevelop.Gui
-{
-	public class EditTemplateDialog : BaseSharpDevelopForm 
-	{
-		void AcceptEvent(object sender, EventArgs e)
-		{
-//			codeTemplate.Shortcut    = ControlDictionary["templateTextBox"].Text;
-//			codeTemplate.Description = ControlDictionary["descriptionTextBox"].Text;
-		}
-		
-		void InitializeComponents()
-		{
-			SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.EditTemplateDialog.xfrm"));
-			
-//			ControlDictionary["templateTextBox"].Text    = codeTemplate.Shortcut;
-//			ControlDictionary["descriptionTextBox"].Text = codeTemplate.Description;
-			
-			ControlDictionary["okButton"].Click += new EventHandler(AcceptEvent);
-			
-			Icon  = null;
-		}
-	}
-}
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml
index 3a2bb39ce4..59688bea26 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/TreeViewOptionsDialog.xaml
@@ -3,6 +3,8 @@
         x:Class="ICSharpCode.SharpDevelop.Gui.TreeViewOptionsDialog"
         Height="414"
         Width="552"
+        MinHeight="260"
+        MinWidth="480"
         Style="{StaticResource DialogWindow}">
 	<Grid>
 		<Grid.RowDefinitions>
diff --git a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj
index 30f9d94eee..abe4ddcaab 100644
--- a/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj
+++ b/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj
@@ -67,6 +67,7 @@
     <Compile Include="..\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="RestrictDesiredSize.cs" />
     <Compile Include="SortableGridViewColumn.cs" />
     <Compile Include="CollapsiblePanel.cs" />
     <Compile Include="ConditionalSeparator.cs" />
diff --git a/src/Main/ICSharpCode.Core.Presentation/RestrictDesiredSize.cs b/src/Main/ICSharpCode.Core.Presentation/RestrictDesiredSize.cs
new file mode 100644
index 0000000000..670a25e3aa
--- /dev/null
+++ b/src/Main/ICSharpCode.Core.Presentation/RestrictDesiredSize.cs
@@ -0,0 +1,37 @@
+// <file>
+//     <copyright see="prj:///doc/copyright.txt"/>
+//     <license see="prj:///doc/license.txt"/>
+//     <owner name="Daniel Grunwald"/>
+//     <version>$Revision$</version>
+// </file>
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace ICSharpCode.Core.Presentation
+{
+	/// <summary>
+	/// Cancels the desired size of the child elements. Use this control around scrolling containers (e.g. ListBox) used
+	/// inside auto-scroll contexts.
+	/// </summary>
+	public class RestrictDesiredSize : Decorator
+	{
+		Size lastArrangeSize = new Size(double.NaN, double.NaN);
+		
+		protected override Size MeasureOverride(Size constraint)
+		{
+			return new Size(0, 0);
+		}
+		
+		protected override Size ArrangeOverride(Size arrangeSize)
+		{
+			if (lastArrangeSize != arrangeSize) {
+				lastArrangeSize = arrangeSize;
+				base.MeasureOverride(arrangeSize);
+			}
+			return base.ArrangeOverride(arrangeSize);
+		}
+	}
+}