diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index a252ab372b..01b9f9b665 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -68,10 +68,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.snackbar.Snackbar;
 
 import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -557,9 +555,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_execute_rules, order++, R.string.title_execute_rules);
             }
 
-            if (folder.accountProtocol == EntityAccount.TYPE_POP)
-                popupMenu.getMenu().add(Menu.NONE, R.string.title_export_messages, order++, R.string.title_export_messages);
-
             int childs = 0;
             if (folder.child_refs != null)
                 for (TupleFolderEx child : folder.child_refs)
@@ -637,9 +632,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     } else if (itemId == R.string.title_execute_rules) {
                         onActionExecuteRules();
                         return true;
-                    } else if (itemId == R.string.title_export_messages) {
-                        onActionExportMessages();
-                        return true;
                     } else if (itemId == R.string.title_edit_properties) {
                         onActionEditProperties();
                         return true;
@@ -941,26 +933,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     ask.show(parentFragment.getParentFragmentManager(), "folder:execute");
                 }
 
-                private void onActionExportMessages() {
-                    Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
-                    intent.addCategory(Intent.CATEGORY_OPENABLE);
-                    intent.setType("*/*");
-                    intent.putExtra(Intent.EXTRA_TITLE, "fairemail_" +
-                            new SimpleDateFormat("yyyyMMdd").format(new Date().getTime()) + ".mbox");
-                    Helper.openAdvanced(intent);
-
-                    if (intent.resolveActivity(context.getPackageManager()) == null) { //  // system/GET_CONTENT whitelisted
-                        ToastEx.makeText(context, R.string.title_no_saf, Toast.LENGTH_LONG).show();
-                        return;
-                    }
-
-                    parentFragment.getArguments().putLong("selected_folder", folder.id);
-
-                    parentFragment.startActivityForResult(
-                            Helper.getChooser(context, intent),
-                            FragmentFolders.REQUEST_EXPORT_MESSAGES);
-                }
-
                 private void onActionEditProperties() {
                     LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
                     lbm.sendBroadcast(
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 82547bd975..11f1539b06 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -20,14 +20,12 @@ package eu.faircode.email;
 */
 
 import android.app.Dialog;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -57,27 +55,17 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
-import com.sun.mail.mbox.MboxProvider;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.text.NumberFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.List;
-import java.util.Properties;
 
-import javax.mail.Folder;
-import javax.mail.Message;
 import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
 
 import static android.app.Activity.RESULT_OK;
 
@@ -112,7 +100,6 @@ public class FragmentFolders extends FragmentBase {
     static final int REQUEST_EMPTY_FOLDER = 2;
     static final int REQUEST_DELETE_FOLDER = 3;
     static final int REQUEST_EXECUTE_RULES = 4;
-    static final int REQUEST_EXPORT_MESSAGES = 5;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -616,10 +603,6 @@ public class FragmentFolders extends FragmentBase {
                     if (resultCode == RESULT_OK && data != null)
                         onExecuteRules(data.getBundleExtra("args"));
                     break;
-                case REQUEST_EXPORT_MESSAGES:
-                    if (resultCode == RESULT_OK && data != null)
-                        onExportMessages(data.getData());
-                    break;
             }
         } catch (Throwable ex) {
             Log.e(ex);
@@ -850,86 +833,6 @@ public class FragmentFolders extends FragmentBase {
         }.execute(this, args, "folder:rules");
     }
 
-    private void onExportMessages(Uri uri) {
-        long id = getArguments().getLong("selected_folder", -1L);
-
-        Bundle args = new Bundle();
-        args.putLong("id", id);
-        args.putParcelable("uri", uri);
-
-        new SimpleTask<Void>() {
-            @Override
-            protected void onPreExecute(Bundle args) {
-                ToastEx.makeText(getContext(), R.string.title_executing, Toast.LENGTH_LONG).show();
-            }
-
-            @Override
-            protected void onPostExecute(Bundle args) {
-                ToastEx.makeText(getContext(), R.string.title_completed, Toast.LENGTH_LONG).show();
-            }
-
-            @Override
-            protected Void onExecute(Context context, Bundle args) throws Throwable {
-                long fid = args.getLong("id");
-                Uri uri = args.getParcelable("uri");
-
-                if (!"content".equals(uri.getScheme())) {
-                    Log.w("Export uri=" + uri);
-                    throw new IllegalArgumentException(context.getString(R.string.title_no_stream));
-                }
-
-                DB db = DB.getInstance(context);
-                List<Long> ids = db.message().getMessageIdsByFolder(fid);
-                if (ids == null)
-                    ids = new ArrayList<>();
-
-                File tmp = new File(context.getCacheDir(), "export_" + fid + ".mbox");
-                tmp.createNewFile();
-
-                System.setProperty("mail.mbox.locktype", "none");
-
-                Properties iprops = new Properties();
-                Session isession = Session.getDefaultInstance(iprops);
-                isession.addProvider(new MboxProvider());
-
-                Store istore = isession.getStore("mbox");
-                istore.connect();
-
-                try {
-                    Folder ifolder = istore.getDefaultFolder().getFolder(tmp.getAbsolutePath());
-                    ifolder.open(Folder.READ_WRITE);
-
-                    for (long id : ids) {
-                        EntityMessage message = db.message().getMessage(id);
-                        if (message == null)
-                            continue;
-
-                        Message imessage = MessageHelper.from(context, message, null, isession, false);
-                        ifolder.appendMessages(new Message[]{imessage});
-                    }
-
-                } finally {
-                    istore.close();
-                }
-
-                ContentResolver resolver = context.getContentResolver();
-                try (OutputStream out = resolver.openOutputStream(uri)) {
-                    Helper.copy(new FileInputStream(tmp), out);
-                }
-
-                if (!BuildConfig.DEBUG)
-                    tmp.delete();
-
-                return null;
-            }
-
-            @Override
-            protected void onException(Bundle args, Throwable ex) {
-                Log.unexpectedError(getParentFragmentManager(), ex);
-            }
-        }.execute(this, args, "folder:export");
-    }
-
     public static class FragmentDialogApply extends FragmentDialogBase {
         @NonNull
         @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2958914c96..2843038317 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -788,7 +788,6 @@
     <string name="title_edit_properties">Edit properties</string>
     <string name="title_edit_rules">Edit rules</string>
     <string name="title_execute_rules">Execute rules</string>
-    <string name="title_export_messages">Export messages</string>
     <string name="title_create_channel">Create notification channel</string>
     <string name="title_edit_channel">Edit notification channel</string>
     <string name="title_delete_channel">Delete notification channel</string>