diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 07d0ce2c..4ce7c878 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index e38fe6ed..375ef35c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "eu.faircode.email"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 42
-        versionName "0.42"
+        versionCode 43
+        versionName "0.43"
         archivesBaseName = "FairEmail-v$versionName"
 
         javaCompileOptions {
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index f2dc25d7..08123198 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -774,7 +774,7 @@ public class FragmentAccount extends FragmentEx {
                     tilPassword.getEditText().setText(account == null ? null : account.password);
 
                     etName.setText(account == null ? null : account.name);
-                    etSignature.setText(account == null ? null : Html.fromHtml(account.signature));
+                    etSignature.setText(account == null || account.signature == null ? null : Html.fromHtml(account.signature));
 
                     cbSynchronize.setChecked(account == null ? true : account.synchronize);
                     cbPrimary.setChecked(account == null ? true : account.primary);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 8f34dc70..aac5d83a 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1624,6 +1624,7 @@ public class ServiceSynchronize extends LifecycleService {
                 join(main);
 
                 main = null;
+                state = null;
 
                 EntityLog.log(ServiceSynchronize.this, "Main stopped " + main);
             }