diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java
index cc359a6ac..eb4509976 100644
--- a/src/com/fsck/k9/K9.java
+++ b/src/com/fsck/k9/K9.java
@@ -33,6 +33,7 @@ import com.fsck.k9.activity.UpgradeDatabases;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.mail.Address;
+import com.fsck.k9.mail.K9MailLib;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.internet.BinaryTempFileBody;
@@ -272,7 +273,7 @@ public class K9 extends Application {
 
     public static final String REMOTE_UID_PREFIX = "K9REMOTE:";
 
-    public static final String IDENTITY_HEADER = "X-K9mail-Identity";
+    public static final String IDENTITY_HEADER = K9MailLib.IDENTITY_HEADER;
 
     /**
      * Specifies how many messages will be shown in a folder by default. This number is set
@@ -303,7 +304,7 @@ public class K9 extends Application {
 
     public static final int MANUAL_WAKE_LOCK_TIMEOUT = 120000;
 
-    public static final int PUSH_WAKE_LOCK_TIMEOUT = 60000;
+    public static final int PUSH_WAKE_LOCK_TIMEOUT = K9MailLib.PUSH_WAKE_LOCK_TIMEOUT;
 
     public static final int MAIL_SERVICE_WAKE_LOCK_TIMEOUT = 60000;
 
diff --git a/src/com/fsck/k9/mail/K9MailLib.java b/src/com/fsck/k9/mail/K9MailLib.java
index 490b5e67a..21090cdaa 100644
--- a/src/com/fsck/k9/mail/K9MailLib.java
+++ b/src/com/fsck/k9/mail/K9MailLib.java
@@ -1,14 +1,14 @@
 package com.fsck.k9.mail;
 
+
 import com.fsck.k9.K9;
 
 public class K9MailLib {
     private K9MailLib() {}
 
-    public static final String LOG_TAG = K9.LOG_TAG;
-
-    public static final int PUSH_WAKE_LOCK_TIMEOUT = K9.PUSH_WAKE_LOCK_TIMEOUT;
-    public static final String IDENTITY_HEADER     = K9.IDENTITY_HEADER;
+    public static final String LOG_TAG             = "k9";
+    public static final int PUSH_WAKE_LOCK_TIMEOUT = 60000;
+    public static final String IDENTITY_HEADER     = "X-K9mail-Identity";
 
     /**
      * Should K-9 log the conversation it has over the wire with