diff --git a/ICSharpCode.AvalonEdit/TextEditor.xaml b/ICSharpCode.AvalonEdit/TextEditor.xaml
index 20b19be0..57b3adc4 100644
--- a/ICSharpCode.AvalonEdit/TextEditor.xaml
+++ b/ICSharpCode.AvalonEdit/TextEditor.xaml
@@ -55,6 +55,7 @@
 			</Setter.Value>
 		</Setter>
 		<Setter Property="SelectionForeground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+		<Setter Property="TextOptions.TextFormattingMode" Value="{Binding (TextOptions.TextFormattingMode), RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ScrollContentPresenter}}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type editing:TextArea}">
diff --git a/ICSharpCode.AvalonEdit/TextEditorOptions.cs b/ICSharpCode.AvalonEdit/TextEditorOptions.cs
index 5b0fa553..7158fc94 100644
--- a/ICSharpCode.AvalonEdit/TextEditorOptions.cs
+++ b/ICSharpCode.AvalonEdit/TextEditorOptions.cs
@@ -493,5 +493,49 @@ public bool AllowToggleOverstrikeMode {
 				}
 			}
 		}
+
+		bool enableTextAntialiasing = true;
+
+		/// <summary>
+		/// Gets/Sets if anti-aliasing should be applied while text rendering.
+		/// </summary>
+		[DefaultValue(true)]
+		public bool EnableTextAntialiasing
+		{
+			get
+			{
+				return enableTextAntialiasing;
+			}
+			set
+			{
+				if (enableTextAntialiasing != value)
+				{
+					enableTextAntialiasing = value;
+					OnPropertyChanged("EnableTextAntialiasing");
+				}
+			}
+		}
+
+		bool enableTextHinting = true;
+
+		/// <summary>
+		/// Gets/Sets if TrueType hinting should be applied while text rendering.
+		/// </summary>
+		[DefaultValue(true)]
+		public bool EnableTextHinting
+		{
+			get
+			{
+				return enableTextHinting;
+			}
+			set
+			{
+				if (enableTextHinting != value)
+				{
+					enableTextHinting = value;
+					OnPropertyChanged("EnableTextHinting");
+				}
+			}
+		}
 	}
 }