--- evolution-2.12.3/addressbook/gui/contact-editor/e-contact-editor-address.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/addressbook/gui/contact-editor/e-contact-editor-address.c	2008-02-12 10:42:53.000000000 -0500
@@ -455,7 +455,7 @@
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
 	g_object_unref(widget);
 
-	icon_list = e_icon_factory_get_icon_list ("contact-new");
+	icon_list = e_icon_factory_get_icon_list ("stock_contact");
 	if (icon_list) {
 		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_address), icon_list);
 		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
--- evolution-2.12.3/addressbook/gui/contact-editor/e-contact-editor-fullname.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/addressbook/gui/contact-editor/e-contact-editor-fullname.c	2008-02-12 10:42:53.000000000 -0500
@@ -140,7 +140,7 @@
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
 	g_object_unref(widget);
 
-	icon_list = e_icon_factory_get_icon_list ("contact-new");
+	icon_list = e_icon_factory_get_icon_list ("stock_contact");
 	if (icon_list) {
 		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_fullname), icon_list);
 		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
--- evolution-2.12.3/addressbook/gui/contact-editor/e-contact-editor-im.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/addressbook/gui/contact-editor/e-contact-editor-im.c	2008-02-12 10:42:53.000000000 -0500
@@ -289,7 +289,7 @@
 	gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username"));
 
 	/* set the icon */
-	icon_list = e_icon_factory_get_icon_list ("contact-new");
+	icon_list = e_icon_factory_get_icon_list ("stock_contact");
 	if (icon_list) {
 		gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_im), icon_list);
 		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
--- evolution-2.12.3/addressbook/gui/widgets/e-addressbook-view.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/addressbook/gui/widgets/e-addressbook-view.c	2008-02-12 10:42:53.000000000 -0500
@@ -958,7 +958,7 @@
 static EPopupItem eabv_popup_items[] = {
 	{ E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE },
 	{ E_POPUP_BAR, "10.bar" },
-	{ E_POPUP_ITEM, "10.new",  N_("_New Contact..."), new_card, NULL, "contact-new", 0, EAB_POPUP_SELECT_EDITABLE},
+	{ E_POPUP_ITEM, "10.new",  N_("_New Contact..."), new_card, NULL, "stock_contact", 0, EAB_POPUP_SELECT_EDITABLE},
 	{ E_POPUP_ITEM, "15.newlist", N_("New Contact _List..."), new_list, NULL, "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE },
 
 	{ E_POPUP_BAR, "20.bar" },
--- evolution-2.12.3/addressbook/gui/component/addressbook-view.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/addressbook/gui/component/addressbook-view.c	2008-02-12 10:42:53.000000000 -0500
@@ -71,7 +71,7 @@
 static GObjectClass *parent_class = NULL;
 
 /* This is used for the addressbook status bar */
-#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "contact-new"
+#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "stock_contact"
 static GdkPixbuf *progress_icon = NULL;
 
 #define d(x)
@@ -623,7 +623,7 @@
 	E_PIXMAP ("/commands/ContactsPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/ContactsSaveAsVCard", "document-save-as", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/ContactsSendContactToOther", "mail-forward", E_ICON_SIZE_MENU),	
-	E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-send", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/ContactsSendMessageToContact", "stock_mail-send", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FolderCopy", "edit-copy", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FolderDelete", "edit-delete", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU),
@@ -951,7 +951,7 @@
 }
 
 static EPopupItem abv_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "contact-new", 0, 0 },
+	{ E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "stock_contact", 0, 0 },
 	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY },
  	{ E_POPUP_BAR,  "40.bar"},
  	{ E_POPUP_ITEM, "40.saveasvcard", N_("Save As Vcard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY },
@@ -1332,7 +1332,7 @@
 	e_activity_handler_attach_task_bar (priv->activity_handler,
 					    E_TASK_BAR (priv->statusbar_widget));
 
-	priv->info_widget = e_info_label_new("contact-new");
+	priv->info_widget = e_info_label_new("stock_contact");
 	e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), "");
 	gtk_widget_show (priv->info_widget);
 
--- evolution-2.12.3/addressbook/gui/component/addressbook-component.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/addressbook/gui/component/addressbook-component.c	2008-02-12 10:42:53.000000000 -0500
@@ -229,7 +229,7 @@
 	list->_buffer[0].menuDescription = _("_Contact");
 	list->_buffer[0].tooltip = _("Create a new contact");
 	list->_buffer[0].menuShortcut = 'c';
-	list->_buffer[0].iconName = "contact-new";
+	list->_buffer[0].iconName = "stock_contact";
 	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
 
 	list->_buffer[1].id = "contact_list";
--- evolution-2.12.3/addressbook/printing/e-contact-print.c.rebase-5.2	2007-10-12 02:39:11.000000000 -0400
+++ evolution-2.12.3/addressbook/printing/e-contact-print.c	2008-02-12 10:42:53.000000000 -0500
@@ -46,6 +46,11 @@
 
 #include "e-contact-print.h"
 
+/* Added to Pango 1.16 */
+#include <math.h>
+#define pango_units_to_double(x)	((double) (x) / PANGO_SCALE)
+#define pango_units_from_double(x)	((int) floor ((x) * PANGO_SCALE + 0.5))
+
 typedef struct _EContactPrintContext EContactPrintContext;
 typedef struct _ContactPrintItem ContactPrintItem;
 
@@ -171,7 +176,7 @@
 	 * XXX Works well for English, what about other locales? */
 	metrics = pango_context_get_metrics (
 		pango_layout_get_context (layout),
-		desc, pango_language_get_default ());
+		desc, gtk_get_default_language ());
 	width = pango_font_metrics_get_approximate_char_width (metrics) * 3;
 	pango_font_metrics_unref (metrics);
 
--- evolution-2.12.3/configure.in.rebase-5.2	2008-02-12 10:42:52.000000000 -0500
+++ evolution-2.12.3/configure.in	2008-02-12 10:42:53.000000000 -0500
@@ -31,7 +31,7 @@
 m4_define([dbus_minimum_version], [1.0.0])
 m4_define([hal_minimum_version], [0.5.4])
 m4_define([libnotify_minimum_version], [0.3.0])
-m4_define([gnome_pilot_minimum_version], [2.0.15])
+m4_define([gnome_pilot_minimum_version], [2.0.13])
 
 # GNOME Documentation
 GNOME_DOC_INIT
--- evolution-2.12.3/configure.rebase-5.2	2008-02-12 10:42:52.000000000 -0500
+++ evolution-2.12.3/configure	2008-02-12 10:42:54.000000000 -0500
@@ -28612,12 +28612,12 @@
         pkg_cv_GNOME_PILOT_CFLAGS="$GNOME_PILOT_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 >= 2.0.15\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-pilot-2.0 >= 2.0.15") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 >= 2.0.13\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gnome-pilot-2.0 >= 2.0.13") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GNOME_PILOT_CFLAGS=`$PKG_CONFIG --cflags "gnome-pilot-2.0 >= 2.0.15" 2>/dev/null`
+  pkg_cv_GNOME_PILOT_CFLAGS=`$PKG_CONFIG --cflags "gnome-pilot-2.0 >= 2.0.13" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -28630,12 +28630,12 @@
         pkg_cv_GNOME_PILOT_LIBS="$GNOME_PILOT_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 >= 2.0.15\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-pilot-2.0 >= 2.0.15") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 >= 2.0.13\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gnome-pilot-2.0 >= 2.0.13") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GNOME_PILOT_LIBS=`$PKG_CONFIG --libs "gnome-pilot-2.0 >= 2.0.15" 2>/dev/null`
+  pkg_cv_GNOME_PILOT_LIBS=`$PKG_CONFIG --libs "gnome-pilot-2.0 >= 2.0.13" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -28654,14 +28654,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GNOME_PILOT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-pilot-2.0 >= 2.0.15"`
+	        GNOME_PILOT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-pilot-2.0 >= 2.0.13"`
         else
-	        GNOME_PILOT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-pilot-2.0 >= 2.0.15"`
+	        GNOME_PILOT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-pilot-2.0 >= 2.0.13"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNOME_PILOT_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-pilot-2.0 >= 2.0.15) were not met:
+	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-pilot-2.0 >= 2.0.13) were not met:
 
 $GNOME_PILOT_PKG_ERRORS
 
@@ -28672,7 +28672,7 @@
 and GNOME_PILOT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (gnome-pilot-2.0 >= 2.0.15) were not met:
+echo "$as_me: error: Package requirements (gnome-pilot-2.0 >= 2.0.13) were not met:
 
 $GNOME_PILOT_PKG_ERRORS
 
--- evolution-2.12.3/widgets/misc/e-attachment-bar.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/widgets/misc/e-attachment-bar.c	2008-02-12 10:42:54.000000000 -0500
@@ -281,7 +281,7 @@
 		attachment = priv->attachments->pdata[i];
 		
 		if (!attachment->is_available_local || !attachment->body) {
-			if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) {
+			if ((pixbuf = e_icon_factory_get_icon("stock_attach", E_ICON_SIZE_DIALOG))) {
 				attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, "");
 				g_object_unref (pixbuf);
 			}
@@ -372,7 +372,7 @@
 			pixbuf = e_icon_for_mime_type (mime_type, 48);
 			if (pixbuf == NULL) {
 				g_warning("cannot find icon for mime type %s (installation problem?)", mime_type);
-				pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG);
+				pixbuf = e_icon_factory_get_icon("stock_attach", E_ICON_SIZE_DIALOG);
 			}
 			g_free (mime_type);
 		}
--- evolution-2.12.3/calendar/gui/e-week-view.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/calendar/gui/e-week-view.c	2008-02-12 10:42:54.000000000 -0500
@@ -697,7 +697,7 @@
 	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
 	week_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
 	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
-	week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
+	week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
 	week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
 }
 
--- evolution-2.12.3/calendar/gui/e-day-view.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/calendar/gui/e-day-view.c	2008-02-12 10:42:54.000000000 -0500
@@ -1423,7 +1423,7 @@
 	day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
-	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
+	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); 
 
 
 	/* Set the canvas item colors. */
@@ -1497,7 +1497,7 @@
 	day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU);
 	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
-	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); 
+	day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); 
 
 
 	/* Set the canvas item colors. */
--- evolution-2.12.3/calendar/gui/print.c.rebase-5.2	2008-01-06 05:56:00.000000000 -0500
+++ evolution-2.12.3/calendar/gui/print.c	2008-02-12 10:42:54.000000000 -0500
@@ -56,6 +56,10 @@
 
 #include <glade/glade-xml.h>
 
+/* Added to Pango 1.16 */
+#define pango_units_to_double(x)	((double) (x) / PANGO_SCALE)
+#define pango_units_from_double(x)	((int) floor ((x) * PANGO_SCALE + 0.5))
+
 typedef struct PrintCompItem PrintCompItem;
 typedef struct PrintCalItem PrintCalItem;
 
--- evolution-2.12.3/calendar/gui/dialogs/comp-editor.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/calendar/gui/dialogs/comp-editor.c	2008-02-12 10:42:54.000000000 -0500
@@ -1497,12 +1497,12 @@
 	E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/Help", "help-contents", E_ICON_SIZE_MENU),
 
 	E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/FileClose", "window-close", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
 
 	E_PIXMAP_END
 };
@@ -1561,7 +1561,7 @@
 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5);
 	expander_hbox = gtk_hbox_new (FALSE, 0);
 	
-	attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU);
+	attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
 	priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf);
 	gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5);
 	gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1);
--- evolution-2.12.3/mail/em-folder-view.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/mail/em-folder-view.c	2008-02-12 10:42:54.000000000 -0500
@@ -1237,12 +1237,12 @@
 	{ E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "stock_mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
 
 	{ E_POPUP_BAR, "50.emfv", NULL, NULL, NULL, NULL },
-	{ E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "mail-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "stock_mail-open", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "stock_mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "emblem-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, "50.emfv.03", N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, "50.emfv.04", N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, "mail-mark-junk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK },
-	{ E_POPUP_ITEM, "50.emfv.05", N_("Mark as _Not Junk"), emfv_popup_mark_nojunk, NULL, "mail-mark-notjunk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_NOT_JUNK },
+	{ E_POPUP_ITEM, "50.emfv.05", N_("Mark as _Not Junk"), emfv_popup_mark_nojunk, NULL, "mail-mark-not-junk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_NOT_JUNK },
 	{ E_POPUP_ITEM, "50.emfv.06", N_("Mark for Follo_w Up..."), emfv_popup_flag_followup, NULL, "stock_mail-flag-for-followup",  EM_POPUP_SELECT_FLAG_FOLLOWUP|EM_FOLDER_VIEW_SELECT_LISTONLY },
 
 	{ E_POPUP_SUBMENU, "60.label.00", N_("_Label"), NULL, NULL, NULL, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
@@ -1963,9 +1963,9 @@
 	E_PIXMAP ("/commands/MessageForward", "mail-forward", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageMarkAsImportant", "emblem-important", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/MessageMarkAsRead", "mail-read", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/MessageMarkAsUnRead", "mail-unread", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MessageMarkAsNotJunk", "mail-mark-not-junk", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MessageMarkAsRead", "stock_mail-open", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/MessageMarkAsUnRead", "stock_mail-unread", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_MENU),
@@ -1976,7 +1976,7 @@
 	E_PIXMAP ("/commands/TextZoomIn", "zoom-in", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/TextZoomOut", "zoom-out", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/TextZoomReset", "zoom-original", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/ViewLoadImages", "insert-image", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/ViewLoadImages", "stock_insert_image", E_ICON_SIZE_MENU),
 
 	E_PIXMAP ("/menu/MessagePlaceholder/Message/MessageNavigation/GoTo", "go-jump", E_ICON_SIZE_MENU),
 
@@ -1988,7 +1988,7 @@
 	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "stock_mail-copy", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "mail-mark-not-junk", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "go-next", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR),
 
--- evolution-2.12.3/mail/em-format-html-print.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/mail/em-format-html-print.c	2008-02-12 10:42:54.000000000 -0500
@@ -35,6 +35,9 @@
 #include "em-format-html-print.h"
 #include <e-util/e-print.h>
 
+/* Added to Pango 1.16 */
+#define pango_units_to_double(x)	((double) (x) / PANGO_SCALE)
+
 static gpointer parent_class = NULL;
 
 static void
@@ -126,7 +129,7 @@
 	desc = pango_font_description_from_string ("Sans Regular 10");
 
 	metrics = pango_context_get_metrics (
-		pango_context, desc, pango_language_get_default ());
+		pango_context, desc, gtk_get_default_language ());
 	footer_height =
 		pango_font_metrics_get_ascent (metrics) +
 		pango_font_metrics_get_descent (metrics);
--- evolution-2.12.3/mail/em-popup.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/mail/em-popup.c	2008-02-12 10:42:54.000000000 -0500
@@ -632,7 +632,7 @@
 static EPopupItem emp_standard_uri_popups[] = {
 	{ E_POPUP_ITEM, "00.uri.00", N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_HTTP },
 	{ E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "mail-message-new", EM_POPUP_URI_MAILTO },
-	{ E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "contact-new", EM_POPUP_URI_MAILTO },
+	{ E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "stock_contact", EM_POPUP_URI_MAILTO },
 };
 
 /* ********************************************************************** */
--- evolution-2.12.3/mail/em-folder-browser.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/mail/em-folder-browser.c	2008-02-12 10:42:54.000000000 -0500
@@ -206,7 +206,7 @@
 /* Options for View */
 static EMFBSearchBarItem emfb_view_items[] = {
 	{{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL},
-	{{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"},
+	{{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "stock_mail-unread"},
 	{{ NULL, 0, 0 }, NULL},
 	{{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL},
 	{{ NULL, -1, 0 }, NULL}
@@ -215,12 +215,12 @@
 /* TODO: Following options should be  customizable */
 static EMFBSearchBarItem temp_view_items[] = {
 	{{ NULL, 0, 0 }, NULL},
-	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"},
+	{{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"},
 	{{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL},
 	{{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL},
-	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"},
+	{{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"},
 	{{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"},
-	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"},
+	{{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-not-junk"},
 /* 	{ NULL, 0, NULL }, */
 /* 	{ N_("Customize"), NOT_IMPLEMENTED, NULL }, */
 	{{ NULL, -1, 0 }, NULL}
--- evolution-2.12.3/mail/mail-mt.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/mail/mail-mt.c	2008-02-12 10:42:54.000000000 -0500
@@ -964,7 +964,7 @@
 			data->activity_state = 1;
 			
 			if (progress_icon == NULL)
-				progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU);
+				progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU);
 			
 			MAIL_MT_UNLOCK (mail_msg_lock);
 			if (msg->info->desc)
--- evolution-2.12.3/mail/mail-send-recv.c.rebase-5.2	2008-02-12 10:46:00.000000000 -0500
+++ evolution-2.12.3/mail/mail-send-recv.c	2008-02-12 10:46:26.000000000 -0500
@@ -560,7 +560,7 @@
 			info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
 		
 		send_icon = e_icon_factory_get_image (
-			"mail-send", E_ICON_SIZE_LARGE_TOOLBAR);
+			"stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR);
 		pretty_url = format_url (destination, NULL);
 		label = gtk_label_new (NULL);
 		gtk_label_set_ellipsize (
--- evolution-2.12.3/mail/message-list.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/mail/message-list.c	2008-02-12 10:42:54.000000000 -0500
@@ -217,13 +217,13 @@
 	char *icon_name;
 	GdkPixbuf  *pixbuf;
 } states_pixmaps[] = {
-	{ "mail-unread",                       NULL },
-	{ "mail-read",                         NULL },
-	{ "mail-replied",                      NULL },
+	{ "stock_mail-unread",                 NULL },
+	{ "stock_mail-open",                   NULL },
+	{ "mail-reply-sender",                 NULL },
 	{ "stock_mail-unread-multiple",        NULL },
 	{ "stock_mail-open-multiple",          NULL },
 	{ NULL,                                NULL },
-	{ "mail-attachment",                   NULL },
+	{ "stock_attach",                      NULL },
 	{ "emblem-important",                  NULL },
 	{ "stock_score-lowest",                NULL },
 	{ "stock_score-lower",                 NULL },
--- evolution-2.12.3/composer/e-msg-composer.c.rebase-5.2	2008-02-12 10:42:53.000000000 -0500
+++ evolution-2.12.3/composer/e-msg-composer.c	2008-02-12 10:42:54.000000000 -0500
@@ -2209,16 +2209,16 @@
 
 static EPixmap pixcache [] = {
 	E_PIXMAP ("/commands/DeleteAll", "edit-delete", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/FileAttach", "mail-attachment", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/FileAttach", "stock_attach", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FileOpen", "document-open", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/FileSaveAs", "document-save-as", E_ICON_SIZE_MENU),
-	E_PIXMAP ("/commands/FileSend", "mail-send", E_ICON_SIZE_MENU),
+	E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU),
 	
-	E_PIXMAP ("/Toolbar/FileSend", "mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/FileSaveDraft", "document-save", E_ICON_SIZE_LARGE_TOOLBAR) ,
-	E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
+	E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR),
 	
 	E_PIXMAP_END
 };
@@ -3992,7 +3992,7 @@
 	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5);
 	expander_hbox = gtk_hbox_new (FALSE, 0);
 	
-	p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU);
+	p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);
 	gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5);
 	gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1);