diff --git a/astrid/res/layout/update_message_view.xml b/astrid/res/layout/update_message_view.xml
new file mode 100644
index 000000000..58b2b2dd4
--- /dev/null
+++ b/astrid/res/layout/update_message_view.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+** Copyright (c) 2012 Todoroo Inc
+**
+** See the file "LICENSE" for the full license governing this code. 
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/reminder_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="10dip"
+    android:paddingRight="10dip"
+    android:orientation="vertical">
+    
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="5dip"
+        android:layout_marginRight="5dip"
+        android:layout_marginBottom="20dip"
+        android:layout_marginLeft="5dip">
+        
+        <TextView 
+            android:id="@+id/update_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:textColor="@android:color/white"
+            android:text="@string/UpS_updates_title"
+            android:layout_weight="1"/>
+        <ImageView
+            android:id="@+id/dismiss"
+            android:layout_width="25dip"
+            android:layout_height="25dip"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_menu_close"/>
+    
+    </LinearLayout>
+    
+    <include layout="@layout/astrid_speech_bubble"/>
+
+    <Button
+        android:id="@+id/ok"
+        android:layout_width="fill_parent"
+        android:layout_height="35dip"
+        android:layout_marginLeft="5dip"
+        android:layout_marginRight="5dip"
+        android:layout_marginBottom="10dip"
+        android:textColor="@android:color/white"
+        android:textSize="20sp"
+        android:background="?attr/asThemeTextColor"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
index 6fdce74eb..16b2751df 100644
--- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
@@ -15,19 +15,16 @@ import org.json.JSONObject;
 import org.weloveastrid.rmilk.MilkUtilities;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.text.Spannable;
 import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager.BadTokenException;
+import android.widget.Button;
 import android.widget.TextView;
 
 import com.timsu.astrid.R;
@@ -40,7 +37,6 @@ import com.todoroo.andlib.service.RestClient;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
-import com.todoroo.andlib.utility.Pair;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.dao.StoreObjectDao;
 import com.todoroo.astrid.dao.StoreObjectDao.StoreObjectCriteria;
@@ -83,13 +79,19 @@ public class UpdateMessageService {
         if(updates == null || updates.length() == 0)
             return;
 
-        Pair<String, Spannable> message = buildUpdateMessage(updates);
-        if(message == null || message.getLeft().length() == 0)
+        MessageTuple message = buildUpdateMessage(updates);
+        if(message == null || message.message.length() == 0)
             return;
 
         displayUpdateDialog(message);
     }
 
+    private static class MessageTuple {
+        public String message = null;
+        public String linkText = null;
+        public OnClickListener click = null;
+    }
+
     private static interface DialogShower {
         void showDialog(Activity activity);
     }
@@ -109,33 +111,33 @@ public class UpdateMessageService {
         }
     }
 
-    protected void displayUpdateDialog(final Pair<String, Spannable> message) {
+    protected void displayUpdateDialog(final MessageTuple message) {
         if(activity == null)
             return;
 
         final DialogShower ds;
-        if (message.getRight() != null) {
+        if (message.linkText != null) {
             ds = new DialogShower() {
                 @Override
                 public void showDialog(Activity a) {
                     try {
-                        View view = activity.getLayoutInflater().inflate(R.layout.update_message_link, null);
-                        TextView messageView = (TextView) view.findViewById(R.id.update_message);
-                        messageView.setText(message.getLeft());
-                        messageView.setTextColor(activity.getResources().getColor(ThemeService.getDialogTextColor()));
-
-                        TextView linkView = (TextView) view.findViewById(R.id.update_link);
-                        linkView.setMovementMethod(LinkMovementMethod.getInstance());
-                        linkView.setText(message.getRight());
-
-                        final Dialog d = new AlertDialog.Builder(a)
-                        .setTitle(R.string.UpS_updates_title)
-                        .setView(view)
-                        .setPositiveButton(R.string.DLG_ok, null)
-                        .create();
-                        linkView.setOnClickListener(new OnClickListener() {
+                        final Dialog d = new Dialog(activity, R.style.ReminderDialog);
+                        d.setContentView(R.layout.update_message_view);
+                        TextView messageView = (TextView) d.findViewById(R.id.reminder_message);
+                        messageView.setText(message.message);
+                        d.findViewById(R.id.dismiss).setOnClickListener(new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                d.dismiss();
+                            }
+                        });
+
+                        Button linkButton = (Button) d.findViewById(R.id.ok);
+                        linkButton.setText(message.linkText);
+                        linkButton.setOnClickListener(new OnClickListener() {
                             @Override
                             public void onClick(View v) {
+                                message.click.onClick(v);
                                 d.dismiss();
                             }
                         });
@@ -148,7 +150,7 @@ public class UpdateMessageService {
         } else {
             String color = ThemeService.getDialogTextColorString();
             final String html = "<html><body style='color: " + color + "'>" +
-                    message.getLeft() + "</body></html>";
+                    message.message + "</body></html>";
             ds = new DialogShower() {
                 @Override
                 public void showDialog(Activity a) {
@@ -167,7 +169,7 @@ public class UpdateMessageService {
 
     }
 
-    protected Pair<String, Spannable> buildUpdateMessage(JSONArray updates) {
+    protected MessageTuple buildUpdateMessage(JSONArray updates) {
         for(int i = 0; i < updates.length(); i++) {
             JSONObject update;
             try {
@@ -192,23 +194,23 @@ public class UpdateMessageService {
                     continue;
             }
 
-            Pair<String, Spannable> toReturn;
+            MessageTuple toReturn = new MessageTuple();
             String type = update.optString("type", null);
             if ("screen".equals(type) || "pref".equals(type)) {
                 String linkText = update.optString("link");
-                Spannable span = Spannable.Factory.getInstance().newSpannable(linkText);
-                ClickableSpan click = getClickableSpanForUpdate(update, type);
+                OnClickListener click = getClickListenerForUpdate(update, type);
                 if (click == null)
                     continue;
-                span.setSpan(click, 0, span.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
-                toReturn = Pair.create(message, span);
+                toReturn.message = message;
+                toReturn.linkText = linkText;
+                toReturn.click = click;
             } else {
                 StringBuilder builder = new StringBuilder();
                 if(date != null)
                     builder.append("<b>" + date + "</b><br />");
                 builder.append(message);
                 builder.append("<br /><br />");
-                toReturn = Pair.create(builder.toString(), null);
+                toReturn.message = builder.toString();
             }
 
             if(messageAlreadySeen(date, message))
@@ -218,7 +220,7 @@ public class UpdateMessageService {
         return null;
     }
 
-    private ClickableSpan getClickableSpanForUpdate(JSONObject update, String type) {
+    private OnClickListener getClickListenerForUpdate(JSONObject update, String type) {
         if ("pref".equals(type)) {
             try {
                 if (!update.has("action_list"))
@@ -227,9 +229,9 @@ public class UpdateMessageService {
                 if (prefSpec.length() == 0)
                     return null;
                 final String prefArray = prefSpec.toString();
-                return new ClickableSpan() {
+                return new View.OnClickListener() {
                     @Override
-                    public void onClick(View widget) {
+                    public void onClick(View b) {
                         Intent prefScreen = new Intent(activity, UpdateMessagePreference.class);
                         prefScreen.putExtra(UpdateMessagePreference.TOKEN_PREFS_ARRAY, prefArray);
                         activity.startActivityForResult(prefScreen, 0);
@@ -251,9 +253,9 @@ public class UpdateMessageService {
                     if (!TextUtils.isEmpty(screen))
                         screenList.add(screen);
                 }
-                return new ClickableSpan() {
+                return new View.OnClickListener() {
                     @Override
-                    public void onClick(View widget) {
+                    public void onClick(View v) {
                         Intent screenFlow = new Intent(activity, UpdateScreenFlow.class);
                         screenFlow.putStringArrayListExtra(UpdateScreenFlow.TOKEN_SCREENS, screenList);
                         activity.startActivity(screenFlow);