diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index 2cbc00d5d..d4277c258 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_height="fill_parent"
     android:layout_width="fill_parent"
@@ -46,11 +47,17 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         />
-    <CheckBox
-        android:id="@+id/account_client_certificate"
-        android:layout_width="fill_parent"
+    <com.fsck.k9.view.FoldableLinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/account_setup_basics_client_certificate" />
+        custom:foldedLabel="@string/client_certificate_advanced_options"
+        custom:unFoldedLabel="@string/client_certificate_advanced_options">
+        <CheckBox
+            android:id="@+id/account_client_certificate"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/account_setup_basics_client_certificate" />
+    </com.fsck.k9.view.FoldableLinearLayout>
     <View
         android:layout_width="fill_parent"
         android:layout_height="0dip"
diff --git a/res/layout/foldable_linearlayout.xml b/res/layout/foldable_linearlayout.xml
index 7d6d44828..9dc2ac1f9 100644
--- a/res/layout/foldable_linearlayout.xml
+++ b/res/layout/foldable_linearlayout.xml
@@ -11,13 +11,12 @@
         android:clickable="true"
         android:orientation="horizontal" >
 
-        <ImageButton
+        <ImageView
             android:id="@+id/foldableIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginRight="10dp"
-            android:background="@android:color/transparent"
             android:src="@drawable/ic_action_expand" />
 
         <TextView
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 57b7aa0fa..9a91a30fc 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -62,8 +62,6 @@
     <declare-styleable name="FoldableLinearLayout">
         <attr name="foldedLabel" format="string" />
         <attr name="unFoldedLabel" format="string" />
-        <attr name="foldedIcon" format="string" />
-        <attr name="unFoldedIcon" format="string" />
     </declare-styleable>
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4854a6cf4..3139b079f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1130,4 +1130,5 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="client_certificate_spinner_empty">No client certificate</string>
     <string name="client_certificate_spinner_delete">Remove client certificate selection</string>
     <string name="client_certificate_retrieval_failure">"Failed to retrieve client certificate for alias <xliff:g id="alias">%s</xliff:g>"</string>
+    <string name="client_certificate_advanced_options">Advanced options</string>
 </resources>
diff --git a/src/com/fsck/k9/view/FoldableLinearLayout.java b/src/com/fsck/k9/view/FoldableLinearLayout.java
index d54692e6b..e46904412 100644
--- a/src/com/fsck/k9/view/FoldableLinearLayout.java
+++ b/src/com/fsck/k9/view/FoldableLinearLayout.java
@@ -9,24 +9,22 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
-import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 /**
  * Class representing a LinearLayout that can fold and hide it's content when
  * pressed To use just add the following to your xml layout
- * <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
+ * <com.fsck.k9.view.FoldableLinearLayout
  * android:layout_width="wrap_content" android:layout_height="wrap_content"
  * custom:foldedLabel="@string/TEXT_TO_DISPLAY_WHEN_FOLDED"
- * custom:unFoldedLabel="@string/TEXT_TO_DISPLAY_WHEN_UNFOLDED"
- * custom:foldedIcon="ICON_NAME_FROM_FontAwesomeText_TO_USE_WHEN_FOLDED"
- * custom:unFoldedIcon="ICON_NAME_FROM_FontAwesomeText_TO_USE_WHEN_UNFOLDED">
+ * custom:unFoldedLabel="@string/TEXT_TO_DISPLAY_WHEN_UNFOLDED">
  * <include layout="@layout/ELEMENTS_TO_BE_FOLDED"/>
- * </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
+ * </com.fsck.k9.view.FoldableLinearLayout>
  */
 public class FoldableLinearLayout extends LinearLayout {
-    private ImageButton mFoldableIcon;
+    private ImageView mFoldableIcon;
     private boolean mFolded;
     private boolean mHasMigrated = false;
     private Integer mShortAnimationDuration = null;
@@ -108,7 +106,7 @@ public class FoldableLinearLayout extends LinearLayout {
     }
 
     private void initialiseInnerViews() {
-        mFoldableIcon = (ImageButton) mFoldableLayout.findViewById(R.id.foldableIcon);
+        mFoldableIcon = (ImageView) mFoldableLayout.findViewById(R.id.foldableIcon);
         mFoldableIcon.setImageResource(R.drawable.ic_action_expand);
         mFoldableTextView = (TextView) mFoldableLayout.findViewById(R.id.foldableText);
         mFoldableTextView.setText(mFoldedLabel);