diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java
index 6b38ec557..daae1f78d 100644
--- a/k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java
@@ -1,13 +1,8 @@
 
 package com.fsck.k9.mail;
 
-import android.content.Context;
-
-import com.fsck.k9.mail.oauth.OAuth2TokenProvider;
-import com.fsck.k9.mail.ssl.DefaultTrustedSocketFactory;
-import com.fsck.k9.mail.store.StoreConfig;
 import com.fsck.k9.mail.ServerSettings.Type;
-import com.fsck.k9.mail.transport.SmtpTransport;
+import com.fsck.k9.mail.transport.smtp.SmtpTransport;
 import com.fsck.k9.mail.transport.WebDavTransport;
 
 import java.io.UnsupportedEncodingException;
diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/TransportProvider.java b/k9mail-library/src/main/java/com/fsck/k9/mail/TransportProvider.java
index 6e70a650a..989296243 100644
--- a/k9mail-library/src/main/java/com/fsck/k9/mail/TransportProvider.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/TransportProvider.java
@@ -6,7 +6,7 @@ import android.content.Context;
 import com.fsck.k9.mail.oauth.OAuth2TokenProvider;
 import com.fsck.k9.mail.ssl.DefaultTrustedSocketFactory;
 import com.fsck.k9.mail.store.StoreConfig;
-import com.fsck.k9.mail.transport.SmtpTransport;
+import com.fsck.k9.mail.transport.smtp.SmtpTransport;
 import com.fsck.k9.mail.transport.WebDavTransport;
 
 public class TransportProvider {
diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
similarity index 99%
rename from k9mail-library/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
index c962614f4..21c9ea013 100644
--- a/k9mail-library/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
@@ -1,5 +1,5 @@
 
-package com.fsck.k9.mail.transport;
+package com.fsck.k9.mail.transport.smtp;
 
 
 import java.io.BufferedInputStream;
diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java
similarity index 99%
rename from k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportTest.java
rename to k9mail-library/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java
index 9059a45a6..783812eae 100644
--- a/k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportTest.java
+++ b/k9mail-library/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java
@@ -1,4 +1,4 @@
-package com.fsck.k9.mail.transport;
+package com.fsck.k9.mail.transport.smtp;
 
 
 import java.io.IOException;
@@ -22,11 +22,11 @@ import com.fsck.k9.mail.oauth.OAuth2TokenProvider;
 import com.fsck.k9.mail.ssl.TrustedSocketFactory;
 import com.fsck.k9.mail.store.StoreConfig;
 import com.fsck.k9.mail.transport.mockServer.MockSmtpServer;
+import com.fsck.k9.mail.transport.smtp.SmtpTransport;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InOrder;
-import org.robolectric.annotation.Config;
 
 import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportUriTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportUriTest.java
similarity index 98%
rename from k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportUriTest.java
rename to k9mail-library/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportUriTest.java
index 128edab0b..ecfe17e56 100644
--- a/k9mail-library/src/test/java/com/fsck/k9/mail/transport/SmtpTransportUriTest.java
+++ b/k9mail-library/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportUriTest.java
@@ -1,4 +1,4 @@
-package com.fsck.k9.mail.transport;
+package com.fsck.k9.mail.transport.smtp;
 
 import android.annotation.SuppressLint;
 
@@ -6,6 +6,7 @@ import com.fsck.k9.mail.AuthType;
 import com.fsck.k9.mail.ConnectionSecurity;
 import com.fsck.k9.mail.ServerSettings;
 
+import com.fsck.k9.mail.transport.smtp.SmtpTransport;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;