Index: gedit-message-area.c
===================================================================
--- gedit-message-area.c	(revision 6109)
+++ gedit-message-area.c	(working copy)
@@ -164,9 +164,12 @@
 gedit_message_area_class_init (GeditMessageAreaClass *klass)
 {
 	GObjectClass *object_class;
+	GtkWidgetClass *widget_class;
 	GtkBindingSet *binding_set;
 
 	object_class = G_OBJECT_CLASS (klass);
+	widget_class = GTK_WIDGET_CLASS (class);
+
 	object_class->finalize = gedit_message_area_finalize;
 
 	klass->close = gedit_message_area_close;
@@ -189,13 +192,65 @@
 		  			NULL, NULL,
 		  			g_cclosure_marshal_VOID__VOID,
 					G_TYPE_NONE, 0);
+					
+	gtk_widget_class_install_style_property (widget_class,
+						 g_param_spec_int ("content-area-border",
+                                                                   "Content area border",
+                                                                   "Width of border around the main dialog area",
+                                                                   0,
+                                                                   G_MAXINT,
+                                                                   8,
+                                                                   G_PARAM_READABLE|G_PARAM_STATIC_STRINGS));
+	gtk_widget_class_install_style_property (widget_class,
+                                                 g_param_spec_int ("button-spacing",
+                                                                   "Button spacing",
+                                                                   "Spacing between buttons",
+                                                                   0,
+                                                                   G_MAXINT,
+                                                                   16,
+                                                                   G_PARAM_READABLE|G_PARAM_STATIC_STRINGS));
+  
+	gtk_widget_class_install_style_property (widget_class,
+                                                 g_param_spec_int ("action-area-border",
+                                                                   "Action area border",
+                                                                   "Width of border around the button area at the bottom of the dialog",
+                                                                   0,
+                                                                   G_MAXINT,
+                                                                   10,
+                                                                   G_PARAM_READABLE|G_PARAM_STATIC_STRINGS));
 
+
 	binding_set = gtk_binding_set_by_class (klass);
 
 	gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "close", 0);
 }
 
 static void
+update_spacings (GeditMessageArea *message_area)
+{
+	GtkWidget *widget;
+	gint content_area_border;
+	gint button_spacing;
+	gint action_area_border;
+  
+	widget = GEDIT_MESSAGE_AREA (message_area);
+
+	gtk_widget_style_get (widget,
+			      "content-area-border", &content_area_border,
+			      "button-spacing", &button_spacing,
+			      "action-area-border", &action_area_border,
+			      NULL);
+
+	gtk_container_set_border_width (GTK_CONTAINER (message_area->priv->main_box),
+                                        content_area_border);
+	gtk_box_set_spacing (GTK_BOX (message_area->priv->action_area),
+                             button_spacing);
+	gtk_container_set_border_width (GTK_CONTAINER (message_area->priv->action_area),
+                                        action_area_border);
+}
+
+
+static void
 style_set (GtkWidget        *widget,
 	   GtkStyle         *prev_style,
 	   GeditMessageArea *message_area)
@@ -205,6 +260,8 @@
 
 	if (message_area->priv->changing_style)
 		return;
+		
+	update_spacings (message_area);
 
 	/* This is a hack needed to use the tooltip background color */
 	window = gtk_window_new (GTK_WINDOW_POPUP);
@@ -226,12 +283,10 @@
 {
 	message_area->priv = GEDIT_MESSAGE_AREA_GET_PRIVATE (message_area);
 
-	message_area->priv->main_hbox = gtk_hbox_new (FALSE, 16); /* FIXME: use style properties */
+	message_area->priv->main_hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (message_area->priv->main_hbox);
-	gtk_container_set_border_width (GTK_CONTAINER (message_area->priv->main_hbox),
-					8); /* FIXME: use style properties */
 
-	message_area->priv->action_area = gtk_vbox_new (TRUE, 10); /* FIXME: use style properties */
+	message_area->priv->action_area = gtk_vbox_new (TRUE, 0);
 	gtk_widget_show (message_area->priv->action_area);
 	gtk_box_pack_end (GTK_BOX (message_area->priv->main_hbox),
 			    message_area->priv->action_area,
