diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index e2f77aafaf..5bfe9ac9fc 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -68,6 +68,16 @@ public class ApplicationEx extends Application
     @Override
     protected void attachBaseContext(Context base) {
         TinyLogConfigurationLoader.setup(base);
+
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            @Override
+            public void run() {
+                Log.i("App shutdown" +
+                        " version=" + BuildConfig.VERSION_NAME + BuildConfig.REVISION +
+                        " process=" + android.os.Process.myPid());
+            }
+        });
+
         super.attachBaseContext(getLocalizedContext(base));
     }