diff --git a/.classpath b/.classpath
index 1ec5220aa..d47d4cf37 100644
--- a/.classpath
+++ b/.classpath
@@ -8,7 +8,6 @@
 	<classpathentry kind="lib" path="libs/commons-io-2.0.1.jar"/>
 	<classpathentry kind="lib" path="libs/jzlib-1.0.7.jar"/>
 	<classpathentry kind="lib" path="libs/jutf7-1.0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="compile-only-libs/bcprov-jdk15-143.jar"/>
 	<classpathentry kind="lib" path="compile-only-libs/commons-codec-1.3.jar"/>
 	<classpathentry kind="lib" path="compile-only-libs/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/compile-only-libs/bcprov-jdk15-143.jar b/compile-only-libs/bcprov-jdk15-143.jar
deleted file mode 100644
index f7bf1169d..000000000
Binary files a/compile-only-libs/bcprov-jdk15-143.jar and /dev/null differ
diff --git a/src/com/fsck/k9/helper/DomainNameChecker.java b/src/com/fsck/k9/helper/DomainNameChecker.java
index 267e4222e..b46f16118 100644
--- a/src/com/fsck/k9/helper/DomainNameChecker.java
+++ b/src/com/fsck/k9/helper/DomainNameChecker.java
@@ -16,7 +16,7 @@
 
 package com.fsck.k9.helper;
 
-import org.bouncycastle.asn1.x509.X509Name;
+import android.net.http.SslCertificate;
 import android.util.Log;
 import com.fsck.k9.K9;
 import java.net.InetAddress;
@@ -28,7 +28,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import java.util.Vector;
 
 /**
  * Implements basic domain-name validation as specified by RFC2818.
@@ -198,14 +197,8 @@ public class DomainNameChecker {
         }
 
         if (!hasDns) {
-            X509Name xName = new X509Name(certificate.getSubjectDN().getName());
-            Vector<?> val = xName.getValues();
-            Vector<?> oid = xName.getOIDs();
-            for (int i = 0; i < oid.size(); i++) {
-                if (oid.elementAt(i).equals(X509Name.CN)) {
-                    return matchDns(thisDomain, (String)(val.elementAt(i)));
-                }
-            }
+            SslCertificate sslCertificate = new SslCertificate(certificate);
+            return matchDns(thisDomain, sslCertificate.getIssuedTo().getCName());
         }
 
         return false;