diff --git a/src/com/fsck/k9/helper/DomainNameChecker.java b/src/com/fsck/k9/helper/DomainNameChecker.java
index 435e644b9..e3beb10cd 100644
--- a/src/com/fsck/k9/helper/DomainNameChecker.java
+++ b/src/com/fsck/k9/helper/DomainNameChecker.java
@@ -82,7 +82,6 @@ public class DomainNameChecker
     /**
      * @return True iff the domain name is specified as an IP address
      */
-    @SuppressWarnings("null")
     private static boolean isIpAddress(String domain)
     {
         boolean rval = ((domain != null) && (domain.length() != 0));
diff --git a/src/com/fsck/k9/mail/Message.java b/src/com/fsck/k9/mail/Message.java
index 435ff511c..e2cfe9800 100644
--- a/src/com/fsck/k9/mail/Message.java
+++ b/src/com/fsck/k9/mail/Message.java
@@ -4,10 +4,6 @@ package com.fsck.k9.mail;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
-
-import android.util.Log;
-
-import com.fsck.k9.K9;
 import com.fsck.k9.activity.MessageReference;
 
 public abstract class Message implements Part, Body