diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index a5a7181..e2ad14b 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -47,12 +47,14 @@
 struct _EABContactDisplayPrivate {
 	EContact *contact;
 	EABContactDisplayMode mode;
+	GtkOrientation orientation;
 };
 
 enum {
 	PROP_0,
 	PROP_CONTACT,
-	PROP_MODE
+	PROP_MODE,
+	PROP_ORIENTATION
 };
 
 enum {
@@ -461,8 +463,50 @@ get_email_location (EVCardAttribute *attr)
 }
 
 static void
-render_contact (GString *buffer,
-                EContact *contact)
+render_photo_block(GString *buffer,
+				   EContact *contact)
+{
+	const gchar *str;
+	gchar *html;
+	EContactPhoto *photo;
+
+	g_string_append_printf (
+			buffer, "<table border=\"0\"><tr>"
+			"<td %s valign=\"top\">", TEXT_IS_RIGHT_TO_LEFT ?
+			"align=\"right\"" : "");
+	photo = e_contact_get (contact, E_CONTACT_PHOTO);
+	if (!photo)
+		photo = e_contact_get (contact, E_CONTACT_LOGO);
+	/* Only handle inlined photos for now */
+	if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
+		g_string_append (buffer, "<img border=\"1\" src=\"internal-contact-photo:\">");
+		e_contact_photo_free (photo);
+	}
+
+	g_string_append_printf (
+		buffer, "</td><td width=\"20\"></td><td %s valign=\"top\">\n",
+		TEXT_IS_RIGHT_TO_LEFT ? "align=\"right\"" : "");
+
+	str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
+	if (!str)
+		str = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
+
+	if (str) {
+		html = e_text_to_html (str, 0);
+		if (e_contact_get (contact, E_CONTACT_IS_LIST))
+			g_string_append_printf (buffer, "<h2><a href=\"internal-mailto:0\">%s</a></h2>", html);
+		else
+			g_string_append_printf (buffer, "<h2>%s</h2>", html);
+		g_free (html);
+	}
+
+	g_string_append (buffer, "</td></tr></table>");
+
+}
+
+static void
+render_contact_block(GString *buffer,
+					 EContact *contact)
 {
 	GString *accum;
 	GList *email_list, *l, *email_attr_list, *al;
@@ -470,7 +514,6 @@ render_contact (GString *buffer,
 	const gchar *nl;
 	gchar *nick=NULL;
 
-	g_string_append (buffer, "<table border=\"0\">");
 
 	accum = g_string_new ("");
 	nl = "";
@@ -549,8 +592,14 @@ render_contact (GString *buffer,
 		g_string_append_printf (buffer, "%s", accum->str);
 
 	end_block (buffer);
+}
 
-	g_string_assign (accum, "");
+static void
+render_work_block(GString *buffer,
+				  EContact *contact)
+{
+	GString *accum;
+	accum = g_string_new ("");
 
 	accum_attribute (accum, contact, _("Company"), E_CONTACT_ORG, NULL, 0);
 	accum_attribute (accum, contact, _("Department"), E_CONTACT_ORG_UNIT, NULL, 0);
@@ -570,8 +619,14 @@ render_contact (GString *buffer,
 		g_string_append_printf (buffer, "%s", accum->str);
 		end_block (buffer);
 	}
+}
 
-	g_string_assign (accum, "");
+static void
+render_personal_block(GString *buffer,
+					  EContact *contact)
+{
+	GString *accum;
+	accum = g_string_new ("");
 
 	accum_attribute (accum, contact, _("Home Page"), E_CONTACT_HOMEPAGE_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
 	accum_attribute (accum, contact, _("Web Log"), E_CONTACT_BLOG_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
@@ -587,7 +642,12 @@ render_contact (GString *buffer,
 		g_string_append_printf (buffer, "%s", accum->str);
 		end_block (buffer);
 	}
+}
 
+static void
+render_notes_block(GString *buffer,
+				   EContact *contact)
+{
 	start_block (buffer, "");
 
 	render_attribute (
@@ -596,11 +656,97 @@ render_contact (GString *buffer,
 		E_TEXT_TO_HTML_CONVERT_URLS |
 		E_TEXT_TO_HTML_CONVERT_NL);
 	end_block (buffer);
+}
+
+#ifdef address_map
+static void
+render_address_map(GString *buffer,
+				   EContact *contact,
+				   int MAP_TYPE)
+{
+
+
+}
+#endif
+
+static void
+render_contact_horizontal(GString *buffer,
+                EContact *contact)
+{
+	g_string_append (buffer, "<table border=\"0\">");
+	render_photo_block(buffer, contact);
+	g_string_append (buffer, "</table>");
 
+	g_string_append (buffer, "<table border=\"0\">");
+	render_contact_block(buffer, contact);
+	render_work_block(buffer, contact);
+	render_personal_block(buffer, contact);
+	render_notes_block(buffer, contact);
 	g_string_append (buffer, "</table>");
 }
 
 static void
+render_contact_vertical(GString *buffer,
+						  EContact *contact)
+{
+	// First row: photo, contact, work and personal
+	g_string_append (buffer, "<tr>");
+
+	/* First column: photo, name, email, IM */
+	g_string_append (buffer, "<td valign=\"top\">");
+	render_photo_block (buffer, contact);
+	g_string_append (buffer, "<table border=\"0\">");
+	render_contact_block (buffer, contact);
+	g_string_append (buffer, "</table></td>");
+
+	/* Second column: Work */
+	g_string_append (buffer, "<td width=\"30\"></td><td valign=\"top\"><table border=\"0\">");
+	render_work_block (buffer, contact);
+	g_string_append (buffer, "</table></td>");
+
+	/* Third column: Personal */
+	g_string_append (buffer, "<td width=\"30\"></td><td valign=\"top\"><table border=\"0\">");
+	render_personal_block (buffer, contact);
+	g_string_append (buffer, "</table></td>");
+
+
+	/* Second row: notes and maps */
+	g_string_append (buffer, "</tr><tr>");
+
+	/* First column: notes */
+	g_string_append (buffer, "<td valign=\"top\"><table border=\"0\">");
+	render_notes_block (buffer, contact);
+	g_string_append (buffer, "</table></td>");
+
+	/* Work address map */
+	g_string_append(buffer, "<td width=\"30\"></td><td>");
+#ifdef address_map
+	render_address_map (buffer, contact, MAP_TYPE_WORK);
+#endif
+	g_string_append(buffer, "</td>");
+
+	/* Personal address map */
+	g_string_append(buffer, "<td width=\"30\"></td><td>");
+#ifdef address_map
+	render_address_map (buffer, contact, MAP_TYPE_PERSONAL);
+#endif
+	g_string_append (buffer, "</td></tr>");
+
+	g_string_append (buffer, "</table>\n");
+}
+
+static void
+render_contact(GString *buffer,
+			   EContact *contact,
+			   GtkOrientation orientation)
+{
+	if (orientation == GTK_ORIENTATION_VERTICAL)
+		render_contact_vertical (buffer, contact);
+	else
+		render_contact_horizontal (buffer, contact);
+}
+
+static void
 eab_contact_display_render_normal (EABContactDisplay *display,
                                    EContact *contact)
 {
@@ -611,50 +757,18 @@ eab_contact_display_render_normal (EABContactDisplay *display,
 	buffer = g_string_sized_new (4096);
 	g_string_append (buffer, HTML_HEADER);
 	g_string_append_printf (
-		buffer, "<body><table width=\"100%%\"><tr>"
+		buffer, "<body><table><tr>"
 		"<td %s>\n", TEXT_IS_RIGHT_TO_LEFT ? "align=\"right\"" : "");
 
 	if (contact) {
-		const gchar *str;
-		gchar *html;
-		EContactPhoto *photo;
-
-		g_string_append_printf (
-			buffer, "<table cellspacing=\"20\" border=\"0\">"
-			"<td %s valign=\"top\">", TEXT_IS_RIGHT_TO_LEFT ?
-			"align=\"right\"" : "");
-		photo = e_contact_get (contact, E_CONTACT_PHOTO);
-		if (!photo)
-			photo = e_contact_get (contact, E_CONTACT_LOGO);
-		/* Only handle inlined photos for now */
-		if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
-			g_string_append (buffer, "<img border=\"1\" src=\"internal-contact-photo:\">");
-			e_contact_photo_free (photo);
-		}
-
-		g_string_append_printf (
-			buffer, "</td><td %s valign=\"top\">\n",
-			TEXT_IS_RIGHT_TO_LEFT ? "align=\"right\"" : "");
-
-		str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
-		if (!str)
-			str = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
-
-		if (str) {
-			html = e_text_to_html (str, 0);
-			if (e_contact_get (contact, E_CONTACT_IS_LIST))
-				g_string_append_printf (buffer, "<h2><a href=\"internal-mailto:0\">%s</a></h2>", html);
-			else
-				g_string_append_printf (buffer, "<h2>%s</h2>", html);
-			g_free (html);
-		}
+		GtkOrientation orientation;
+		orientation = display->priv->orientation;
 
 		if (e_contact_get (contact, E_CONTACT_IS_LIST))
 			render_contact_list (buffer, contact);
 		else
-			render_contact (buffer, contact);
+			render_contact (buffer, contact, orientation);
 
-		g_string_append (buffer, "</td></tr></table>\n");
 	}
 
 	g_string_append (buffer, "</td></tr></table></body></html>\n");
@@ -871,6 +985,12 @@ contact_display_set_property (GObject *object,
 				EAB_CONTACT_DISPLAY (object),
 				g_value_get_int (value));
 			return;
+
+		case PROP_ORIENTATION:
+			eab_contact_display_set_orientation (
+				EAB_CONTACT_DISPLAY (object),
+				g_value_get_int (value));
+			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -894,6 +1014,11 @@ contact_display_get_property (GObject *object,
 				value, eab_contact_display_get_mode (
 				EAB_CONTACT_DISPLAY (object)));
 			return;
+		case PROP_ORIENTATION:
+			g_value_set_int (
+				value, eab_contact_display_get_orientation (
+				EAB_CONTACT_DISPLAY (object)));
+			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -1118,6 +1243,18 @@ eab_contact_display_class_init (EABContactDisplayClass *class)
 			EAB_CONTACT_DISPLAY_RENDER_NORMAL,
 			G_PARAM_READWRITE));
 
+	g_object_class_install_property (
+		object_class,
+		PROP_ORIENTATION,
+		g_param_spec_int(
+			"orientation",
+			NULL,
+			NULL,
+			GTK_ORIENTATION_HORIZONTAL,
+			GTK_ORIENTATION_VERTICAL,
+			GTK_ORIENTATION_HORIZONTAL,
+			G_PARAM_READWRITE));
+
 	signals[SEND_MESSAGE] = g_signal_new (
 		"send-message",
 		G_OBJECT_CLASS_TYPE (class),
@@ -1140,6 +1277,7 @@ eab_contact_display_init (EABContactDisplay *display)
 
 	display->priv = EAB_CONTACT_DISPLAY_GET_PRIVATE (display);
 	display->priv->mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL;
+	display->priv->orientation = GTK_ORIENTATION_HORIZONTAL;
 
 	web_view = E_WEB_VIEW (display);
 	ui_manager = e_web_view_get_ui_manager (web_view);
@@ -1261,3 +1399,37 @@ eab_contact_display_set_mode (EABContactDisplay *display,
 
 	g_object_notify (G_OBJECT (display), "mode");
 }
+
+GtkOrientation
+eab_contact_display_get_orientation (EABContactDisplay *display)
+{
+	g_return_val_if_fail (EAB_IS_CONTACT_DISPLAY (display), 0);
+
+	return display->priv->orientation;
+}
+
+void
+eab_contact_display_set_orientation (EABContactDisplay *display,
+									 GtkOrientation orientation)
+{
+	EABContactDisplayMode mode;
+	EContact *contact;
+
+	g_return_if_fail (EAB_IS_CONTACT_DISPLAY (display));
+
+	display->priv->orientation = orientation;
+	contact = eab_contact_display_get_contact (display);
+	mode = eab_contact_display_get_mode (display);
+
+	switch (mode) {
+		case EAB_CONTACT_DISPLAY_RENDER_NORMAL:
+			eab_contact_display_render_normal (display, contact);
+			break;
+
+		case EAB_CONTACT_DISPLAY_RENDER_COMPACT:
+			eab_contact_display_render_compact (display, contact);
+			break;
+	}
+
+	g_object_notify (G_OBJECT (display), "orientation");
+}
diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h
index fde3bc6..afa07e7 100644
--- a/addressbook/gui/widgets/eab-contact-display.h
+++ b/addressbook/gui/widgets/eab-contact-display.h
@@ -88,6 +88,11 @@ EABContactDisplayMode
 void		eab_contact_display_set_mode	(EABContactDisplay *display,
 						 EABContactDisplayMode mode);
 
+GtkOrientation
+		eab_contact_display_get_orientation (EABContactDisplay *display);
+void	eab_contact_display_set_orientation (EABContactDisplay *display,
+						GtkOrientation orientation);
+
 G_END_DECLS
 
 #endif /* EAB_CONTACT_DISPLAY_H */
diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c
index 1d510fb..a2f7f9c 100644
--- a/modules/addressbook/e-book-shell-content.c
+++ b/modules/addressbook/e-book-shell-content.c
@@ -262,6 +262,17 @@ book_shell_content_constructed (GObject *object)
 	eab_contact_display_set_mode (
 		EAB_CONTACT_DISPLAY (widget),
 		EAB_CONTACT_DISPLAY_RENDER_NORMAL);
+
+	eab_contact_display_set_orientation (
+		EAB_CONTACT_DISPLAY (widget),
+		priv->orientation);
+
+	g_object_bind_property (
+		object, "orientation",
+		widget, "orientation",
+		G_BINDING_SYNC_CREATE);
+
+
 	e_shell_configure_web_view (shell, E_WEB_VIEW (widget));
 	gtk_widget_show (widget);
 
