diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 457ac40..f73e1c9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name="i2p.bote.MailListActivity"
+            android:name="i2p.bote.EmailListActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop" >
             <intent-filter>
@@ -25,10 +25,10 @@
         </activity>
         <activity
             android:name="i2p.bote.ViewEmailActivity"
-            android:parentActivityName="i2p.bote.MailListActivity" />
+            android:parentActivityName="i2p.bote.EmailListActivity" />
         <activity
             android:name="i2p.bote.SettingsActivity"
-            android:parentActivityName="i2p.bote.MailListActivity" />
+            android:parentActivityName="i2p.bote.EmailListActivity" />
     </application>
 
 </manifest>
diff --git a/src/i2p/bote/MailListActivity.java b/src/i2p/bote/EmailListActivity.java
similarity index 96%
rename from src/i2p/bote/MailListActivity.java
rename to src/i2p/bote/EmailListActivity.java
index 3f2bb85..59a0f80 100644
--- a/src/i2p/bote/MailListActivity.java
+++ b/src/i2p/bote/EmailListActivity.java
@@ -18,8 +18,8 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-public class MailListActivity extends ActionBarActivity implements
-        FolderFragment.OnEmailSelectedListener {
+public class EmailListActivity extends ActionBarActivity implements
+        EmailListFragment.OnEmailSelectedListener {
     private CharSequence mDrawerTitle;
     private CharSequence mTitle;
     private SharedPreferences mSharedPrefs;
@@ -103,7 +103,7 @@ public class MailListActivity extends ActionBarActivity implements
         mDrawerLayout.setDrawerListener(mDrawerToggle);
 
         if (savedInstanceState == null) {
-            FolderFragment f = FolderFragment.newInstance("inbox");
+            EmailListFragment f = EmailListFragment.newInstance("inbox");
             getSupportFragmentManager().beginTransaction()
                     .add(R.id.list_fragment, f).commit();
             mFolderList.setItemChecked(0, true);
@@ -126,7 +126,7 @@ public class MailListActivity extends ActionBarActivity implements
     private void selectItem(int position) {
         // Create the new fragment
         EmailFolder folder = mFolderAdapter.getItem(position);
-        FolderFragment f = FolderFragment.newInstance(folder.getName());
+        EmailListFragment f = EmailListFragment.newInstance(folder.getName());
 
         // Insert the fragment
         getSupportFragmentManager().beginTransaction()
diff --git a/src/i2p/bote/FolderFragment.java b/src/i2p/bote/EmailListFragment.java
similarity index 96%
rename from src/i2p/bote/FolderFragment.java
rename to src/i2p/bote/EmailListFragment.java
index 22fc83e..c24987b 100644
--- a/src/i2p/bote/FolderFragment.java
+++ b/src/i2p/bote/EmailListFragment.java
@@ -18,7 +18,7 @@ import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.ListView;
 
-public class FolderFragment extends ListFragment implements
+public class EmailListFragment extends ListFragment implements
         LoaderManager.LoaderCallbacks<List<Email>> {
     public static final String FOLDER_NAME = "folder_name";
 
@@ -29,8 +29,8 @@ public class FolderFragment extends ListFragment implements
     private EmailListAdapter mAdapter;
     private EmailFolder mFolder;
 
-    public static FolderFragment newInstance(String folderName) {
-        FolderFragment f = new FolderFragment();
+    public static EmailListFragment newInstance(String folderName) {
+        EmailListFragment f = new EmailListFragment();
         Bundle args = new Bundle();
         args.putString(FOLDER_NAME, folderName);
         f.setArguments(args);