diff --git a/res/menu/accounts_context.xml b/res/menu/accounts_context.xml
index 9b7c32b90..7c62fd1d8 100644
--- a/res/menu/accounts_context.xml
+++ b/res/menu/accounts_context.xml
@@ -4,6 +4,8 @@
         android:title="@string/manage_accounts_move_up_action" />
     <item android:id="@+id/move_down"
         android:title="@string/manage_accounts_move_down_action" />
+    <item android:id="@+id/account_settings"
+        android:title="@string/account_settings_action" />
     <item android:id="@+id/advanced"
         android:title="@string/advanced">
         <menu>
diff --git a/res/menu/folder_context.xml b/res/menu/folder_context.xml
index f3194db91..592704197 100644
--- a/res/menu/folder_context.xml
+++ b/res/menu/folder_context.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/refresh_folder"
+        android:title="@string/check_mail_action"
     />
     <item
         android:id="@+id/clear_local_folder"
         android:title="@string/clear_local_folder_action"
     />
-	
+    <item
+        android:id="@+id/folder_settings"
+        android:title="@string/folder_settings_action"
+    />
 </menu>
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index d68b8edc4..21bdb833c 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -64,6 +64,7 @@ import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
 import com.fsck.k9.activity.misc.ExtendedAsyncTask;
 import com.fsck.k9.activity.misc.NonConfigurationInstance;
+import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.AccountSetupBasics;
 import com.fsck.k9.activity.setup.Prefs;
 import com.fsck.k9.activity.setup.WelcomeMessage;
@@ -961,6 +962,10 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
         showDialog(DIALOG_REMOVE_ACCOUNT);
     }
 
+    private void onEditAccount(Account account) {
+        AccountSettings.actionSettings(this, account);
+    }
+
     @Override
     public Dialog onCreateDialog(int id) {
         // Android recreates our dialogs on configuration changes even when they have been
@@ -1106,6 +1111,9 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
         case R.id.delete_account:
             onDeleteAccount(realAccount);
             break;
+        case R.id.account_settings:
+            onEditAccount(realAccount);
+            break;
         case R.id.activate:
             onActivateAccount(realAccount);
             break;
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 280a346c6..a17376281 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -654,6 +654,12 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
         case R.id.clear_local_folder:
             onClearFolder(mAccount, folder.name);
             break;
+        case R.id.refresh_folder:
+            checkMail(folder);
+            break;
+        case R.id.folder_settings:
+            FolderSettings.actionSettings(this, mAccount, folder.name);
+            break;
         }
 
         return super.onContextItemSelected(item);