diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 883921a238..be05f47d7a 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -587,6 +587,8 @@ class mail_ui
 			case "fixed":
 				$etpl->setElementAttribute('mailSplitter', 'orientation', 'h');
 				break;
+			default:
+				$etpl->setElementAttribute('mailSplitter', 'orientation', 'v');
 		}
 		return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
 	}
@@ -2243,7 +2245,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 		$ab = new addressbook_bo();
 		$response->data($ab->set_smime_keys(array($_metadata['email'] => $_metadata['cert'])));
 	}
-	
+
 	/**
 	 * Generates certificate base on given data and send
 	 * private key, pubkey and certificate back to client callback.
@@ -2262,7 +2264,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 		{
 			if (empty($_data[$key]) || in_array($key, $discards)) unset($_data[$key]);
 		}
-		$response->data($smime->generate_certificate($_data, $ca, $passphrase));
+		$response->data($smime->generate_certificate($_data, $ca, null, $passphrase));
 	}
 
 	/**
diff --git a/mail/js/app.js b/mail/js/app.js
index 7338883324..164f2a4f5a 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -168,8 +168,8 @@ app.classes.mail = AppJS.extend(
 				var nm = this.et2.getWidgetById(this.nm_index);
 				this.mail_isMainWindow = true;
 				var previewPane = this.egw.preference('previewPane', 'mail');
-				this.mail_disablePreviewArea(previewPane !== 'fixed' && previewPane !== 'vertical');
-				if (previewPane == 'vertical') nm.header.right_div.addClass('vertical_splitter');
+				this.mail_disablePreviewArea(previewPane !== 'fixed' && previewPane !== 'vertical' && previewPane == true);
+				if (previewPane == 'vertical' || previewPane != true) nm.header.right_div.addClass('vertical_splitter');
 				//Get initial folder status
 				this.mail_refreshFolderStatus(undefined,undefined,false);