diff --git a/src/com/android/email/EmailApplication.java b/src/com/android/email/EmailApplication.java
index d9d605ddc..79edbed26 100644
--- a/src/com/android/email/EmailApplication.java
+++ b/src/com/android/email/EmailApplication.java
@@ -21,17 +21,15 @@ import android.content.Context;
 import android.content.Intent;
 
 import com.android.email.preferences.EmailPreferenceMigrator;
+import com.android.mail.browse.ConversationMessage;
 import com.android.mail.browse.InlineAttachmentViewIntentBuilder;
 import com.android.mail.browse.InlineAttachmentViewIntentBuilderCreator;
 import com.android.mail.browse.InlineAttachmentViewIntentBuilderCreatorHolder;
 import com.android.mail.preferences.BasePreferenceMigrator;
 import com.android.mail.preferences.PreferenceMigratorHolder;
 import com.android.mail.preferences.PreferenceMigratorHolder.PreferenceMigratorCreator;
-import com.android.mail.providers.Message;
 import com.android.mail.utils.LogTag;
 
-import java.util.Map;
-
 public class EmailApplication extends Application {
     private static final String LOG_TAG = "Email";
 
@@ -53,7 +51,7 @@ public class EmailApplication extends Application {
                         return new InlineAttachmentViewIntentBuilder() {
                             @Override
                             public Intent createInlineAttachmentViewIntent(Context context,
-                                    String url, Message message) {
+                                    String url, ConversationMessage message) {
                                 return null;
                             }
                         };