diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java
index 1713002fb..608cb9bcb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java
@@ -5,12 +5,11 @@ import android.os.Bundle;
 import android.text.util.Linkify;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.Window;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
 import android.widget.ScrollView;
 import android.widget.TextView;
+import android.widget.LinearLayout.LayoutParams;
 
 import com.timsu.astrid.R;
 import com.todoroo.astrid.data.Task;
@@ -23,16 +22,13 @@ public class NoteViewingActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
         setContentView(R.layout.empty_linear_layout);
-        getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.dialog_title_bar);
         getWindow().setLayout(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
 
         LinearLayout body = (LinearLayout) findViewById(R.id.body);
 
         task = getIntent().getParcelableExtra(NotesActionExposer.EXTRA_TASK);
-        TextView title = (TextView) findViewById(R.id.title);
-        title.setText(task.getValue(Task.TITLE));
+        setTitle(task.getValue(Task.TITLE));
 
         ScrollView scrollView = new ScrollView(this);
 
diff --git a/astrid/res/layout/dialog_title_bar.xml b/astrid/res/layout/dialog_title_bar.xml
deleted file mode 100644
index ccb53be14..000000000
--- a/astrid/res/layout/dialog_title_bar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/title"
-  android:text="This is my new title"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:textColor="#ffffff"
-  android:paddingLeft="6dip"
-  android:ellipsize="marquee"
-  android:textSize="20dip" />
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 654620401..961302f50 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -20,14 +20,21 @@
         <item name="android:windowBackground">@null</item>
     </style>
     
-    <style name="DialogTitleBackground">
+    <!--================================================== Custom Dialogs == -->
+    
+    <style name="DialogTitleText" parent="android:TextAppearance.WindowTitle">
+        <item name="android:textSize">20dip</item>
+    </style>
+    
+     <style name="DialogTitle" parent="android:WindowTitle">
         <item name="android:background">#323331</item>
+        <item name="android:layout_height">26dip</item>
+        <item name="android:textAppearance">@style/DialogTitleText</item>
     </style>
- 
+      
     <style name="Theme.Dialog" parent="android:Theme.Dialog">
-        <item name="android:windowTitleBackgroundStyle">@style/DialogTitleBackground</item>
-        <item name="android:windowTitleSize">32dip</item>
         <item name="android:layout_width">fill_parent</item>
+        <item name="android:windowTitleStyle">@style/DialogTitle</item>
     </style>
     
     <!--=============================================== TaskListActivity == -->