diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 43ec962612..c29448250b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -112,6 +112,7 @@ public class FragmentOAuth extends FragmentBase {
     private EditText etName;
     private EditText etEmail;
     private EditText etTenant;
+    private CheckBox cbInboundOnly;
     private CheckBox cbPop;
     private CheckBox cbUpdate;
     private Button btnOAuth;
@@ -162,6 +163,7 @@ public class FragmentOAuth extends FragmentBase {
         etName = view.findViewById(R.id.etName);
         etEmail = view.findViewById(R.id.etEmail);
         etTenant = view.findViewById(R.id.etTenant);
+        cbInboundOnly = view.findViewById(R.id.cbInboundOnly);
         cbPop = view.findViewById(R.id.cbPop);
         cbUpdate = view.findViewById(R.id.cbUpdate);
         btnOAuth = view.findViewById(R.id.btnOAuth);
@@ -229,6 +231,7 @@ public class FragmentOAuth extends FragmentBase {
         etName.setText(personal);
         etEmail.setText(address);
         etTenant.setText(null);
+        cbInboundOnly.setChecked(false);
         cbPop.setChecked(false);
         cbUpdate.setChecked(update);
 
@@ -284,6 +287,7 @@ public class FragmentOAuth extends FragmentBase {
             etName.setEnabled(false);
             etEmail.setEnabled(false);
             etTenant.setEnabled(false);
+            cbInboundOnly.setEnabled(false);
             cbPop.setEnabled(false);
             cbUpdate.setEnabled(false);
             btnOAuth.setEnabled(false);
@@ -426,6 +430,7 @@ public class FragmentOAuth extends FragmentBase {
             etName.setEnabled(true);
             etEmail.setEnabled(true);
             etTenant.setEnabled(true);
+            cbInboundOnly.setEnabled(true);
             cbPop.setEnabled(true);
             cbUpdate.setEnabled(true);
 
@@ -513,6 +518,7 @@ public class FragmentOAuth extends FragmentBase {
         args.putBoolean("askAccount", askAccount);
         args.putString("personal", etName.getText().toString().trim());
         args.putString("address", etEmail.getText().toString().trim());
+        args.putBoolean("inbound_only", cbInboundOnly.isChecked());
         args.putBoolean("pop", cbPop.isChecked());
         args.putBoolean("update", cbUpdate.isChecked());
 
@@ -537,6 +543,7 @@ public class FragmentOAuth extends FragmentBase {
                 boolean askAccount = args.getBoolean("askAccount", false);
                 String personal = args.getString("personal");
                 String address = args.getString("address");
+                boolean inbound_only = args.getBoolean("inbound_only");
                 boolean pop = args.getBoolean("pop");
 
                 EmailProvider provider = EmailProvider.getProvider(context, id);
@@ -742,18 +749,20 @@ public class FragmentOAuth extends FragmentBase {
                         folders = aservice.getFolders();
                 }
 
-                Log.i("OAuth checking SMTP provider=" + provider.id);
-                Long max_size;
-
-                try (EmailService iservice = new EmailService(
-                        context, iprotocol, null, iencryption, false,
-                        EmailService.PURPOSE_CHECK, true)) {
-                    iservice.connect(
-                            provider.smtp.host, provider.smtp.port,
-                            AUTH_TYPE_OAUTH, provider.id,
-                            username, state,
-                            null, null);
-                    max_size = iservice.getMaxSize();
+                Long max_size = null;
+                if (!inbound_only) {
+                    Log.i("OAuth checking SMTP provider=" + provider.id);
+
+                    try (EmailService iservice = new EmailService(
+                            context, iprotocol, null, iencryption, false,
+                            EmailService.PURPOSE_CHECK, true)) {
+                        iservice.connect(
+                                provider.smtp.host, provider.smtp.port,
+                                AUTH_TYPE_OAUTH, provider.id,
+                                username, state,
+                                null, null);
+                        max_size = iservice.getMaxSize();
+                    }
                 }
 
                 Log.i("OAuth passed provider=" + provider.id);
@@ -839,27 +848,28 @@ public class FragmentOAuth extends FragmentBase {
                         db.account().updateAccount(account);
 
                         // Create identities
-                        for (Pair<String, String> identity : identities) {
-                            EntityIdentity ident = new EntityIdentity();
-                            ident.name = identity.second;
-                            ident.email = identity.first;
-                            ident.account = account.id;
-
-                            ident.host = provider.smtp.host;
-                            ident.encryption = iencryption;
-                            ident.port = provider.smtp.port;
-                            ident.auth_type = AUTH_TYPE_OAUTH;
-                            ident.provider = provider.id;
-                            ident.user = username;
-                            ident.password = state;
-                            ident.use_ip = provider.useip;
-                            ident.synchronize = true;
-                            ident.primary = ident.user.equals(ident.email);
-                            ident.max_size = max_size;
-
-                            ident.id = db.identity().insertIdentity(ident);
-                            EntityLog.log(context, "OAuth identity=" + ident.name + " email=" + ident.email);
-                        }
+                        if (!inbound_only)
+                            for (Pair<String, String> identity : identities) {
+                                EntityIdentity ident = new EntityIdentity();
+                                ident.name = identity.second;
+                                ident.email = identity.first;
+                                ident.account = account.id;
+
+                                ident.host = provider.smtp.host;
+                                ident.encryption = iencryption;
+                                ident.port = provider.smtp.port;
+                                ident.auth_type = AUTH_TYPE_OAUTH;
+                                ident.provider = provider.id;
+                                ident.user = username;
+                                ident.password = state;
+                                ident.use_ip = provider.useip;
+                                ident.synchronize = true;
+                                ident.primary = ident.user.equals(ident.email);
+                                ident.max_size = max_size;
+
+                                ident.id = db.identity().insertIdentity(ident);
+                                EntityLog.log(context, "OAuth identity=" + ident.name + " email=" + ident.email);
+                            }
 
                         args.putBoolean("pop", pop);
                     } else {
@@ -912,6 +922,7 @@ public class FragmentOAuth extends FragmentBase {
         etName.setEnabled(true);
         etEmail.setEnabled(true);
         etTenant.setEnabled(true);
+        cbInboundOnly.setEnabled(true);
         cbPop.setEnabled(true);
         cbUpdate.setEnabled(true);
         btnOAuth.setEnabled(true);
@@ -952,6 +963,7 @@ public class FragmentOAuth extends FragmentBase {
         etName.setEnabled(true);
         etEmail.setEnabled(true);
         etTenant.setEnabled(true);
+        cbInboundOnly.setEnabled(true);
         cbPop.setEnabled(true);
         cbUpdate.setEnabled(true);
         btnOAuth.setEnabled(true);
diff --git a/app/src/main/res/layout/fragment_oauth.xml b/app/src/main/res/layout/fragment_oauth.xml
index e88ff28a79..5560806254 100644
--- a/app/src/main/res/layout/fragment_oauth.xml
+++ b/app/src/main/res/layout/fragment_oauth.xml
@@ -90,6 +90,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etTenant" />
 
+        <CheckBox
+            android:id="@+id/cbInboundOnly"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_inbound"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvTenantHint" />
+
         <CheckBox
             android:id="@+id/cbPop"
             android:layout_width="wrap_content"
@@ -98,7 +108,7 @@
             android:text="@string/title_setup_pop"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvTenantHint" />
+            app:layout_constraintTop_toBottomOf="@id/cbInboundOnly" />
 
         <CheckBox
             android:id="@+id/cbUpdate"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c57d55842..9d47857595 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -200,6 +200,7 @@
     <string name="title_setup_gmail" translatable="false">Gmail</string>
     <string name="title_setup_oauth" translatable="false">%1$s (OAuth)</string>
     <string name="title_setup_other">Other provider</string>
+    <string name="title_setup_inbound">Incoming email only (email cannot be sent!)</string>
     <string name="title_setup_pop3">POP3 account</string>
     <string name="title_setup_oauth_permission">The email provider has approved OAuth only for the Play Store and GitHub version</string>
     <string name="title_setup_gmail_support">Authorizing Google accounts will work in the Play Store and GitHub version only because Android checks the digital app signature</string>