diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 83fa28df6..034eb9d07 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -340,6 +340,16 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="com.android.mail.ui.HelpActivity"
+            android:label="@string/help_and_info">
+        </activity>
+
+        <activity
+            android:name="com.android.mail.ui.LicensesActivity"
+            android:label="@string/open_source_licenses">
+        </activity>
+
         <!-- additional activities -->
 
         <provider
diff --git a/src/com/android/email/activity/setup/AccountSettings.java b/src/com/android/email/activity/setup/AccountSettings.java
index 052d6aaed..d167f3107 100644
--- a/src/com/android/email/activity/setup/AccountSettings.java
+++ b/src/com/android/email/activity/setup/AccountSettings.java
@@ -49,7 +49,6 @@ import com.android.emailcommon.utility.IntentUtilities;
 import com.android.emailcommon.utility.Utility;
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.UIProvider.EditSettingsExtras;
-import com.android.mail.ui.FeedbackEnabledActivity;
 import com.android.mail.utils.LogUtils;
 import com.android.mail.utils.Utils;
 
@@ -70,7 +69,7 @@ import java.util.List;
  *       sense to use a loader for the accounts list, because it would provide better support for
  *       dealing with accounts being added/deleted and triggering the header reload.
  */
-public class AccountSettings extends PreferenceActivity implements FeedbackEnabledActivity,
+public class AccountSettings extends PreferenceActivity implements
         SetupDataFragment.SetupDataContainer, SecurityRequiredDialogFragment.Callback,
         CheckSettingsErrorDialogFragment.Callback, AccountCheckSettingsFragment.Callback,
         AccountServerBaseFragment.Callback {
@@ -988,11 +987,6 @@ public class AccountSettings extends PreferenceActivity implements FeedbackEnabl
         }
     }
 
-    @Override
-    public Context getActivityContext() {
-        return this;
-    }
-
     @Override
     public SetupDataFragment getSetupData() {
         return mSetupData;
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index e4ab1a0fc..b0498fd89 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -2515,6 +2515,14 @@ public class EmailProvider extends ContentProvider {
                         "'" + feedbackUri + "'");
             }
 
+            final String helpUri = context.getString(R.string.help_uri);
+            if (!TextUtils.isEmpty(helpUri)) {
+                // This string needs to be in single quotes, as it will be used as a constant
+                // in a sql expression
+                builder.add(UIProvider.AccountColumns.HELP_INTENT_URI,
+                        "'" + helpUri + "'");
+            }
+
             sAccountListMap = builder.build();
         }
         return sAccountListMap;
@@ -3102,6 +3110,12 @@ public class EmailProvider extends ContentProvider {
         if (res.getBoolean(R.bool.feedback_supported)) {
             capabilities |= UIProvider.AccountCapabilities.SEND_FEEDBACK;
         }
+
+        // If we can find a help URL then add the Help capability
+        if (!TextUtils.isEmpty(context.getResources().getString(R.string.help_uri))) {
+            capabilities |= UIProvider.AccountCapabilities.HELP_CONTENT;
+        }
+
         // TODO: Should this be stored per-account, or some other mechanism?
         capabilities |= UIProvider.AccountCapabilities.NESTED_FOLDERS;