diff --git a/res/layout/account_setup_confirm.xml b/res/layout/account_setup_confirm.xml
index 50aa5c93b..ddeb6ab15 100644
--- a/res/layout/account_setup_confirm.xml
+++ b/res/layout/account_setup_confirm.xml
@@ -160,7 +160,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/confirm_serverbrowse_buttons"
-            android:layout_marginTop="8dp" >
+            android:layout_marginTop="8dp"
+            android:visibility="gone" >
 
             <TextView
                 android:id="@+id/server_documentation_header"
diff --git a/src/com/fsck/k9/activity/setup/AbstractSetupConfirmActivity.java b/src/com/fsck/k9/activity/setup/AbstractSetupConfirmActivity.java
index 03a496b6c..529ef5399 100644
--- a/src/com/fsck/k9/activity/setup/AbstractSetupConfirmActivity.java
+++ b/src/com/fsck/k9/activity/setup/AbstractSetupConfirmActivity.java
@@ -30,7 +30,6 @@ import com.fsck.k9.helper.configxmlparser.AutoconfigInfo.ServerType;
 import com.fsck.k9.helper.configxmlparser.AutoconfigInfo.SocketType;
 import com.fsck.k9.helper.configxmlparser.AutoconfigInfo.Server;
 import com.fsck.k9.helper.configxmlparser.AutoconfigInfo.InformationBlock;
-import org.w3c.dom.Text;
 
 import java.util.List;
 
diff --git a/src/com/fsck/k9/activity/setup/AccountSetupConfirmIncoming.java b/src/com/fsck/k9/activity/setup/AccountSetupConfirmIncoming.java
index 3240b6112..2028b7474 100644
--- a/src/com/fsck/k9/activity/setup/AccountSetupConfirmIncoming.java
+++ b/src/com/fsck/k9/activity/setup/AccountSetupConfirmIncoming.java
@@ -8,12 +8,9 @@ package com.fsck.k9.activity.setup;
 
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 import com.fsck.k9.Account;
-import com.fsck.k9.K9;
 import com.fsck.k9.helper.configxmlparser.AutoconfigInfo;
 import com.fsck.k9.helper.configxmlparser.AutoconfigInfo.ServerType;
-import org.apache.http.conn.scheme.Scheme;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;