diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index ea696f8..df33402 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -2301,17 +2301,36 @@ set_address_label (EContact *contact,
                    EContactAddress *address)
 {
 	gchar *address_label = NULL;
+	gboolean format_address;
+	GConfClient *client;
+	GConfValue *value;
+	const gchar *key;
 
 	if (!address) {
 		e_contact_set (contact, field, NULL);
 		return;
 	}
 
-	address_label = eab_format_address (contact,
-				(field == E_CONTACT_ADDRESS_LABEL_WORK) ? E_CONTACT_ADDRESS_WORK :
-									  E_CONTACT_ADDRESS_HOME);
 
-	if (!address_label) {
+	client = gconf_client_get_default ();
+	value = gconf_client_get (client,
+		"/apps/evolution/addressbook/display/address_formatting", NULL);
+
+	if (value) {
+		format_address = gconf_value_get_bool (value);
+		gconf_value_free (value);
+		g_object_unref (client);
+	} else {
+		format_address = TRUE;
+	}
+
+	if (format_address) {
+		address_label = eab_format_address (contact,
+					(field == E_CONTACT_ADDRESS_LABEL_WORK) ? E_CONTACT_ADDRESS_WORK :
+										  E_CONTACT_ADDRESS_HOME);
+	}
+
+	if (!format_address || !address_label) {
 		address_label = append_to_address_label (
 			address_label, address->street, TRUE);
 		address_label = append_to_address_label (
diff --git a/modules/addressbook/apps_evolution_addressbook.schemas.in b/modules/addressbook/apps_evolution_addressbook.schemas.in
index a6506d7..8241225 100644
--- a/modules/addressbook/apps_evolution_addressbook.schemas.in
+++ b/modules/addressbook/apps_evolution_addressbook.schemas.in
@@ -139,5 +139,17 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/addressbook/display/address_formatting</key>
+      <applyto>/apps/evolution/addressbook/display/address_formatting</applyto>
+      <owner>evolution-addressbook</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Enable address formatting</short>
+        <long>Wheter addresses should be formatted according to standard in their destination country.</long>
+      </locale>
+    </schema>
+
   </schemalist>
 </gconfschemafile>
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index a6aebe0..ec87324 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -998,6 +998,14 @@ static GtkToggleActionEntry contact_toggle_entries[] = {
 	  NULL,
 	  N_("Show maps in contact preview window"),
 	  G_CALLBACK (action_contact_preview_show_maps_cb),
+	  FALSE },
+
+	{ "contact-address-formatting",
+	  NULL,
+	  N_("Enable Address _Formatting"),
+	  NULL,
+	  N_("Format addresses according to standard of their destination country"),
+	  NULL,		/* no callback, only change gconf value */
 	  FALSE }
 };
 
@@ -1222,6 +1230,10 @@ e_book_shell_view_actions_init (EBookShellView *book_shell_view)
 	key = "/apps/evolution/addressbook/display/preview_show_maps";
 	gconf_bridge_bind_property (bridge, key, object, "active");
 
+	object = G_OBJECT (ACTION (CONTACT_ADDRESS_FORMATTING));
+	key = "/apps/evolution/addressbook/display/address_formatting";
+	gconf_bridge_bind_property (bridge, key, object, "active");
+
 	/* Fine tuning. */
 
 	g_signal_connect (
diff --git a/modules/addressbook/e-book-shell-view-actions.h b/modules/addressbook/e-book-shell-view-actions.h
index 87eeaa8..9fdb36d 100644
--- a/modules/addressbook/e-book-shell-view-actions.h
+++ b/modules/addressbook/e-book-shell-view-actions.h
@@ -79,6 +79,9 @@
 	E_SHELL_WINDOW_ACTION ((window), "contact-view-classic")
 #define E_SHELL_WINDOW_ACTION_CONTACT_VIEW_VERTICAL(window) \
 	E_SHELL_WINDOW_ACTION ((window), "contact-view-vertical")
+#define E_SHELL_WINDOW_ACTION_CONTACT_ADDRESS_FORMATTING(window) \
+	E_SHELL_WINDOW_ACTION ((window), "contact-address-formatting")
+
 
 /* Search Actions */
 #define E_SHELL_WINDOW_ACTION_CONTACT_SEARCH_ADVANCED_HIDDEN(window) \
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index 571e825..5981c20 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -33,6 +33,8 @@
           <menuitem action='contact-view-classic'/>
           <menuitem action='contact-view-vertical'/>
         </menu>
+        <separator/>
+        <menuitem action='contact-address-formatting'/>
       </placeholder>
     </menu>
     <placeholder name='custom-menus'>
