diff --git a/app/src/main/java/i2p/bote/android/EmailListFragment.java b/app/src/main/java/i2p/bote/android/EmailListFragment.java
index 76442d8..39599c0 100644
--- a/app/src/main/java/i2p/bote/android/EmailListFragment.java
+++ b/app/src/main/java/i2p/bote/android/EmailListFragment.java
@@ -63,6 +63,7 @@ public class EmailListFragment extends AuthenticatedListFragment implements
     private EmailFolder mFolder;
 
     private MenuItem mNewEmail;
+    private MenuItem mCheckEmail;
 
     // The Controller which provides CHOICE_MODE_MULTIPLE_MODAL-like functionality
     private MultiSelectionUtil.Controller mMultiSelectController;
@@ -211,12 +212,17 @@ public class EmailListFragment extends AuthenticatedListFragment implements
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.email_list, menu);
         mNewEmail = menu.findItem(R.id.action_new_email);
+        mCheckEmail = menu.findItem(R.id.action_check_email);
     }
 
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        mNewEmail.setVisible(!I2PBote.getInstance().isPasswordRequired());
+        boolean passwordRequired = I2PBote.getInstance().isPasswordRequired();
+        mNewEmail.setVisible(!passwordRequired);
+        mCheckEmail.setVisible(mSwipeRefreshLayout != null && !passwordRequired);
+        if (mSwipeRefreshLayout != null)
+            mSwipeRefreshLayout.setEnabled(!passwordRequired);
     }
 
     @Override
@@ -226,6 +232,13 @@ public class EmailListFragment extends AuthenticatedListFragment implements
                 startNewEmail();
                 return true;
 
+            case R.id.action_check_email:
+                if (!mSwipeRefreshLayout.isRefreshing()) {
+                    mSwipeRefreshLayout.setRefreshing(true);
+                    onRefresh();
+                }
+                return true;
+
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/app/src/main/res/menu/email_list.xml b/app/src/main/res/menu/email_list.xml
index e3ed578..3beb58e 100644
--- a/app/src/main/res/menu/email_list.xml
+++ b/app/src/main/res/menu/email_list.xml
@@ -8,4 +8,9 @@
         android:title="@string/action_new_email"
         i2pandroid:showAsAction="ifRoom"/>
 
+    <item
+        android:id="@+id/action_check_email"
+        android:title="@string/check_email"
+        i2pandroid:showAsAction="never"/>
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 89282aa..043db76 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,9 +43,7 @@
     <string name="action_stop_bote">Disconnect from network</string>
     <string name="action_settings">Settings</string>
     <string name="start_i2p_android">It appears that I2P Android is not running. Would you like to start it?</string>
-    <string name="pull_text">Pull to check email</string>
-    <string name="refreshing_text">Checking email…</string>
-    <string name="release_text">Let go to check email</string>
+    <string name="check_email">Check email</string>
     <!-- Argument is a number -->
     <string name="incomplete_emails">%s incomplete emails</string>
     <!-- Argument is a number -->