Merge branch '5.8-MAINT' into main

app/ui/legacy/src/main/res/raw/changelog_master.xml

@@ -5,6 +5,9 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="5.806" versioncode="28006" date="2021-08-30">
+        <change>Fixed the check for missing outgoing server credentials, again… hopefully 🤞</change>
+    </release>
     <release version="5.805" versioncode="28005" date="2021-08-21">
         <change>Fixed the check for missing incoming/outgoing server credentials (introduced in K-9 Mail 5.804)</change>
         <change>Changed the 'save attachment' icon (apparently floppy disks are no longer a thing)</change>

mail/common/src/main/java/com/fsck/k9/mail/ServerSettings.kt

@@ -16,7 +16,7 @@ data class ServerSettings @JvmOverloads constructor(
 ) {
     val isMissingCredentials: Boolean = when (authenticationType) {
         AuthType.EXTERNAL -> clientCertificateAlias == null
-        else -> password == null
+        else -> username.isNotBlank() && password == null
     }
 
     init {