diff --git a/k9mail/src/main/java/com/fsck/k9/K9.java b/k9mail/src/main/java/com/fsck/k9/K9.java
index 252d286ff..5985481bb 100644
--- a/k9mail/src/main/java/com/fsck/k9/K9.java
+++ b/k9mail/src/main/java/com/fsck/k9/K9.java
@@ -45,6 +45,7 @@ import com.fsck.k9.service.ShutdownReceiver;
 import com.fsck.k9.service.StorageGoneReceiver;
 import com.fsck.k9.widget.list.MessageListWidgetProvider;
 import timber.log.Timber;
+import timber.log.Timber.DebugTree;
 
 
 public class K9 extends Application {
@@ -522,6 +523,10 @@ public class K9 extends Application {
         app = this;
         Globals.setContext(this);
 
+        if (BuildConfig.DEBUG) {
+            Timber.plant(new DebugTree());
+        }
+
         K9MailLib.setDebugStatus(new K9MailLib.DebugStatus() {
             @Override public boolean enabled() {
                 return DEBUG;