diff --git a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
index 4e21619d9..eda175696 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
@@ -28,7 +28,6 @@ import com.fsck.k9.mail.filter.Hex;
 
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateParsingException;
 import java.security.cert.X509Certificate;
 import java.security.NoSuchAlgorithmException;
 import java.security.MessageDigest;
@@ -280,10 +279,10 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
 							      case 0:
 							    	  Log.w(K9.LOG_TAG, "SubjectAltName of type OtherName not supported.");
 							    	  continue;
-							      case 1: // RFC822Name 
+							      case 1: // RFC822Name
 							    	  name = (String)value;
 							        break;
-							      case 2:  // DNSName 
+							      case 2:  // DNSName
 							    	  name = (String)value;
 							        break;
 							      case 3:
diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java
index ef3b837f6..69d788c89 100644
--- a/src/com/fsck/k9/mail/store/WebDavStore.java
+++ b/src/com/fsck/k9/mail/store/WebDavStore.java
@@ -4,7 +4,6 @@ import android.util.Log;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
-import com.fsck.k9.R;
 import com.fsck.k9.controller.MessageRetrievalListener;
 import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.*;