diff --git a/res/layout/cert_warning.xml b/res/layout/cert_warning.xml
index 2e1e55117..59d718030 100644
--- a/res/layout/cert_warning.xml
+++ b/res/layout/cert_warning.xml
@@ -10,23 +10,32 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="18sp"/>
+    
+     <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#FFe92727"
+        android:textStyle="bold"
+        android:textSize="18sp"
+        android:text="Do not connect unless you know exactly what you are doing"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"/>
+     
+     <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:text="The SHA1 fingerprint is:" />
 
     <TextView
+        android:layout_gravity="center_horizontal"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
         android:id="@+id/sha"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:typeface="monospace"
-        android:textSize="18sp"/>
-
-    <TextView
-        android:id="@+id/dont"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#FFe92727"
         android:textStyle="bold"
-        android:textSize="18sp"
-        android:text="Do not connect unless you know exactly what you are doing" />
-    
+        android:textSize="20sp"/>
+
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3b575db15..4995523b0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,4 +22,5 @@
     <string name="visitor">Visitor</string>
     <string name="enter_new_name">Enter a new name:</string>
     <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation assoziated with this account will not be removed.</string>
+    <string name="untrusted_cert_hint">The server %s presented you with an unstrusted, possible self signed, certificate.</string>
 </resources>
diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index 91314686c..9e71edb13 100644
--- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -77,10 +77,16 @@ public class ManageAccountActivity extends XmppActivity {
 					TextView hint = (TextView) view.findViewById(R.id.hint);
 					StringBuilder humanReadableSha = new StringBuilder();
 					humanReadableSha.append(fingerprint);
-					for(int i = 2; i < 58; i += 3) {
-						humanReadableSha.insert(i, ":");
+					for(int i = 2; i < 59; i += 3) {
+						Log.d("gultsch","insert into "+i);
+						if ((i==14)||(i==29)||(i==44)) {
+							humanReadableSha.insert(i, "\n");
+						} else {
+							humanReadableSha.insert(i, ":");
+						}
+						
 					}
-					hint.setText(account.getServer()+" presented you with an unstrusted, possible self signed, certificate.\nThe SHA1 fingerprint is");
+					hint.setText(getString(R.string.untrusted_cert_hint,account.getServer()));
 					sha.setText(humanReadableSha.toString());
 					builder.setView(view);
 					//builder.setMessage(server+" presented you with an unstrusted, possible self signed, certificate. The SHA1 fingerprint is "+fingerprint+" Do not connect unless you know exactly what you are doing");