diff --git a/emailcommon/Android.mk b/emailcommon/Android.mk
index b4dddf02f..7f1428043 100644
--- a/emailcommon/Android.mk
+++ b/emailcommon/Android.mk
@@ -20,10 +20,12 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+unified_email_unified_src_dir := ../../UnifiedEmail/unified_src
 unified_email_src_dir := ../../UnifiedEmail/src
 apache_src_dir := ../../UnifiedEmail/src/org
 
 imported_unified_email_files := \
+        $(unified_email_unified_src_dir)/com/android/mail/utils/LogTag.java \
         $(unified_email_src_dir)/com/android/mail/utils/LogUtils.java \
         $(unified_email_src_dir)/com/android/mail/providers/UIProvider.java
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7dcab89e7..4526ed572 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1122,15 +1122,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- First category in general preferences [CHAR LIMIT=64] -->
     <string name="category_general_preferences">Application</string>
 
-    <!-- General preference: Label of the setting for the direction to move to
-         when deleting the current message.
-         Options contain "newer message","older message", etc. [CHAR LIMIT=32] -->
-    <string name="general_preference_auto_advance_label">Auto-advance</string>
-    <!-- General preference: Description of the setting for the direction to move to
-         when deleting the current message.
-         Options contain "newer message","older message", etc. [CHAR LIMIT=64] -->
-    <string name="general_preference_auto_advance_summary">Choose which screen to show after you
-         delete a message</string>
     <!-- General preference: Label of the setting for hiding checkboxes in the
          message list [CHAR LIMIT=32] -->
     <string name="general_preference_hide_checkboxes_label">Hide checkboxes</string>
@@ -1154,22 +1145,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
     <!-- General preference: Description of the setting for requiring confirmation before
          message sending [CHAR LIMIT=32] -->
     <string name="general_preference_confirm_send_summary">Messages</string>
-    <!-- General preference: Title of the dialog box containing options for setting for
-         the direction to move to when deleting the current message.
-         Options contain "newer message","older message", etc. [CHAR LIMIT=32] -->
-    <string name="general_preference_auto_advance_dialog_title">Advance to</string>
-    <!-- General preference: Option for the setting for
-         the direction to move to when deleting the current message.
-         This option is for "move to the newer message" [CHAR LIMIT=32] -->
-    <string name="general_preference_auto_advance_newer">Newer message</string>
-    <!-- General preference: Option for the setting for
-         the direction to move to when deleting the current message.
-         This option is for "move to the older message" [CHAR LIMIT=32] -->
-    <string name="general_preference_auto_advance_older">Older message</string>
-    <!-- General preference: Option for the setting for
-         the direction to move to when deleting the current message.
-         This option is for "move back to the message list" [CHAR LIMIT=32] -->
-    <string name="general_preference_auto_advance_message_list">Message list</string>
 
     <!-- General preference: Label of the setting for the text zoom.  [CHAR LIMIT=32] -->
     <string name="general_preference_text_zoom_label">Message text size</string>