diff -u freeciv-Mar-31/client/tilespec.c freeciv/client/tilespec.c
--- freeciv-Mar-31/client/tilespec.c	Wed Mar  6 02:44:35 2002
+++ freeciv/client/tilespec.c	Thu Apr 11 15:15:16 2002
@@ -432,6 +432,16 @@
        assert(sprites.field != NULL);                          \
     } while(FALSE)
 
+/* Sets sprites.field to tag or (if tag isn't available) to alt,
+   where alt is a pre-existing sprite*/
+#define SET_SPRITE_ALT_PRE(field, tag, alt) do {                   \
+       sprites.field = hash_lookup_data(sprite_hash, tag);     \
+       if (!sprites.field) {                                   \
+           sprites.field = sprites.alt;                        \
+       }                                                       \
+       assert(sprites.field != NULL);                          \
+    } while(FALSE)
+
 /**********************************************************************
   Initialize 'sprites' structure based on hardwired tags which
   freeciv always requires. 
@@ -447,6 +457,8 @@
   SET_SPRITE(treaty_thumb[0], "treaty.disagree_thumb_down");
   SET_SPRITE(treaty_thumb[1], "treaty.agree_thumb_up");
 
+
+
   for(i=0; i<NUM_TILES_PROGRESS; i++) {
     my_snprintf(buffer, sizeof(buffer), "s.science_bulb_%d", i);
     SET_SPRITE(bulb[i], buffer);
@@ -662,6 +675,135 @@
 
   sprites.city.tile_wall = NULL;    /* no place to initialize this variable */
   sprites.city.tile = NULL;         /* no place to initialize this variable */
+
+  SET_SPRITE_ALT_PRE(message_icons[E_LOW_ON_FUNDS], 
+		     "ev.low_funds",        citizen[2]);
+  SET_SPRITE_ALT_PRE(message_icons[E_POLLUTION],
+		     "ev.pollution",        warming[5]);
+  SET_SPRITE_ALT_PRE(message_icons[E_GLOBAL_ECO],   
+		     "ev.ecodisaster",      warming[7]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_DISORDER],
+		     "ev.disorder",         citizen[7]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_LOVE],    
+		     "ev.celebration",      citizen[5]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_NORMAL],  
+		     "ev.normal",           citizen[4]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_GROWTH],
+		     "ev.growth",           upkeep.food[0]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_AQUEDUCT],
+		     "ev.aqueduct",         upkeep.food[0]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_FAMINE],  
+		     "ev.famine",           upkeep.food[0]);
+  SET_SPRITE_ALT    (message_icons[E_CITY_LOST],
+		     "ev.citylost",         "gov.fundamentalism");
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_CANTBUILD],
+		     "ev.cantbuild",        upkeep.shield);
+  SET_SPRITE_ALT_PRE(message_icons[E_WONDER_STARTED],
+		     "ev.wonderstart",      warming[1]);
+  SET_SPRITE_ALT_PRE(message_icons[E_WONDER_BUILD],
+		     "ev.wonderbuilt",      warming[3]);
+  SET_SPRITE_ALT_PRE(message_icons[E_IMP_BUILD],
+		     "ev.improvementbuilt",      upkeep.shield);
+  SET_SPRITE_ALT_PRE(message_icons[E_IMP_AUTO],
+		     "ev.improvementautomatic",  upkeep.shield);
+  SET_SPRITE_ALT_PRE(message_icons[E_IMP_AUCTIONED],
+		     "ev.improvementauctioned",  citizen[2]);
+  SET_SPRITE_ALT_PRE(message_icons[E_UNIT_UPGRADED],
+		     "ev.unitupgraded",          upkeep.shield);
+  SET_SPRITE_ALT_PRE(message_icons[E_UNIT_BUILD],
+		     "ev.unitbuilt",          upkeep.shield);
+  SET_SPRITE_ALT    (message_icons[E_UNIT_LOST],                 
+		     "ev.unitlost",           "gov.fundamentalism");
+  SET_SPRITE_ALT    (message_icons[E_UNIT_WIN],                  
+		     "ev.unitwon",            "gov.fundamentalism");
+  SET_SPRITE_ALT    (message_icons[E_ANARCHY],
+		     "ev.anarchy",            "gov.anarchy");
+  SET_SPRITE_ALT_PRE(message_icons[E_DIPLOMATED],                
+		     "ev.diplomated",         citizen[3]);
+  SET_SPRITE_ALT_PRE(message_icons[E_TECH_GAIN],                 
+		     "ev.techgain",           bulb[7]);
+  SET_SPRITE_ALT    (message_icons[E_DESTROYED],                 
+		     "ev.citydestroyed",      "gov.fundamentalism");
+  SET_SPRITE_ALT_PRE(message_icons[E_IMP_BUY],
+		     "ev.improvementbuy",     upkeep.shield);
+  SET_SPRITE_ALT_PRE(message_icons[E_IMP_SOLD],                  
+		     "ev.improvementsold",    citizen[2]);
+  SET_SPRITE_ALT_PRE(message_icons[E_UNIT_BUY],            
+		     "ev.unitbuy",            upkeep.shield);
+  SET_SPRITE_ALT_PRE(message_icons[E_WONDER_STOPPED],            
+		     "ev.wonderstopped",      warming[1]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_AQ_BUILDING],          
+		     "ev.aqueductbuilding",   upkeep.food[1]);
+  SET_SPRITE_ALT_PRE(message_icons[E_MY_DIPLOMAT],               
+		     "ev.diplomatmine",      citizen[3]);
+  SET_SPRITE_ALT    (message_icons[E_UNIT_LOST_ATT],             
+		     "ev.unitlostattack",     "gov.fundamentalism");
+  SET_SPRITE_ALT    (message_icons[E_UNIT_WIN_ATT],
+		     "ev.unitwonattack",      "gov.fundamentalism");
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_GRAN_THROTTLE],        
+		     "ev.granthrottle",       upkeep.food[0]);
+  SET_SPRITE_ALT_PRE(message_icons[E_SPACESHIP],                 
+		     "ev.spaceship",          bulb[7]);
+  SET_SPRITE_ALT_PRE(message_icons[E_UPRISING],
+		     "ev.uprising",           citizen[7]);
+  SET_SPRITE_ALT_PRE(message_icons[E_WORKLIST],            
+		     "ev.worklist",           citizen[4]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CANCEL_PACT],      
+		     "ev.cancelpact",         citizen[3]);
+  SET_SPRITE_ALT_PRE(message_icons[E_DIPL_INCIDENT],
+		     "ev.diplomatincident",   citizen[3]);
+  SET_SPRITE_ALT_PRE(message_icons[E_FIRST_CONTACT],
+		     "ev.firstcontact",       cooling[1]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_MAY_SOON_GROW],  
+		     "ev.citymaygrow",        upkeep.food[0]);
+  SET_SPRITE_ALT_PRE(message_icons[E_WONDER_OBSOLETE],       
+		     "ev.wonderobsolete",     warming[1]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_FAMINE_FEARED],
+		     "ev.faminefeared",       upkeep.food[0]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_WONDER_WILL_BE_BUILT],
+		     "ev.wonderwillbebuilt",  warming[2]);
+  SET_SPRITE_ALT    (message_icons[E_NEW_GOVERNMENT],
+		     "ev.newgovernment",      "gov.monarchy");
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_NUKED],
+		     "ev.citynuked",          explode.iso_nuke);
+  SET_SPRITE_ALT_PRE(message_icons[E_MESSAGE_WALL],
+		     "ev.warnall",            warming[0]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_CMA_RELEASE],
+		     "ev.CMArelease",         warming[0]);
+  SET_SPRITE_ALT_PRE(message_icons[E_CITY_BUILD],
+		     "ev.citybuild",          upkeep.food[0]);
+  SET_SPRITE_ALT    (message_icons[E_REVOLT_START],
+		     "ev.revoltstart",        "gov.anarchy");
+  SET_SPRITE_ALT    (message_icons[E_REVOLT_DONE],
+		     "ev.revoltdone",         "gov.monarchy");
+  SET_SPRITE_ALT_PRE(message_icons[E_NUKE],
+		     "ev.nuke",               explode.iso_nuke);
+  SET_SPRITE_ALT_PRE(message_icons[E_HUT_GOLD],
+		     "ev.hutgold",            citizen[2]);
+  SET_SPRITE_ALT_PRE(message_icons[E_HUT_TECH],
+		     "ev.huttech",            bulb[7]);
+  SET_SPRITE_ALT    (message_icons[E_HUT_MERC],
+		     "ev.hutmercenaries",     "gov.fundamentalism");
+  SET_SPRITE_ALT    (message_icons[E_HUT_BARB_CITY_NEAR],
+		     "ev.hutmercenaries",     "gov.fundamentalism");
+  SET_SPRITE_ALT    (message_icons[E_HUT_BARB],
+		     "ev.hutbarbarians",     "gov.fundamentalism");
+  SET_SPRITE_ALT    (message_icons[E_HUT_BARB_KILLED],
+		     "ev.hutcowardlybarbs",  "gov.fundamentalism");
+  SET_SPRITE_ALT_PRE(message_icons[E_HUT_CITY],
+		     "ev.hutcity",           upkeep.food[0]);
+  SET_SPRITE_ALT_PRE(message_icons[E_HUT_SETTLER],
+		     "ev.hutnomads",         upkeep.food[0]);
+  SET_SPRITE_ALT_PRE(message_icons[E_GAME_START],
+		     "ev.gamestart",         cooling[3]);
+  SET_SPRITE_ALT_PRE(message_icons[E_NEXT_YEAR],
+		     "ev.nextyear",          cooling[3]);
+  SET_SPRITE_ALT_PRE(message_icons[E_REPORT],
+		     "ev.report",            citizen[3]);
+  SET_SPRITE_ALT_PRE(message_icons[E_BROADCAST_REPORT],
+		     "ev.broadcastreport",   citizen[3]);
+  SET_SPRITE_ALT_PRE(message_icons[E_NATION_SELECTED],
+		     "ev.nationselected",    citizen[3]);
 }
 
 /**********************************************************************
diff -u freeciv-Mar-31/client/tilespec.h freeciv/client/tilespec.h
--- freeciv-Mar-31/client/tilespec.h	Mon Feb 25 04:03:50 2002
+++ freeciv/client/tilespec.h	Thu Apr 11 14:44:32 2002
@@ -22,6 +22,8 @@
 
 #include "colors_g.h"
 
+#include "events.h"
+
 struct Sprite;			/* opaque; gui-dep */
 struct unit;
 struct player;
@@ -84,6 +86,7 @@
     *cooling[NUM_TILES_PROGRESS],
     *citizen[NUM_TILES_CITIZEN],   /* internal code... */
     *treaty_thumb[2],     /* 0=disagree, 1=agree */
+    *message_icons[E_LAST],
     *right_arrow,
     *black_tile,      /* only used for isometric view */
     *dither_tile,     /* only used for isometric view */
@@ -164,6 +167,7 @@
       *pollution,
       *village,
       *fortress,
+      *fortress_back,
       *airbase,
       *fallout,
       *fog,
diff -u freeciv-Mar-31/client/gui-gtk/messagewin.c freeciv/client/gui-gtk/messagewin.c
--- freeciv-Mar-31/client/gui-gtk/messagewin.c	Wed Feb 13 02:15:51 2002
+++ freeciv/client/gui-gtk/messagewin.c	Thu Apr 11 14:51:18 2002
@@ -24,6 +24,7 @@
 #include "events.h"
 #include "fcintl.h"
 #include "game.h"
+#include "government.h"
 #include "map.h"
 #include "mem.h"
 #include "packets.h"
@@ -37,6 +38,7 @@
 #include "gui_stuff.h"
 #include "mapview.h"
 #include "options.h"
+#include "tilespec.h"
 
 #include "messagewin.h"
 
@@ -61,6 +63,26 @@
 
 static int delay_meswin_update=0;
 
+static int event_sprites_initialized = 0;
+
+static void init_event_sprites(void)
+{
+  int start_x, start_y, end_x, end_y;
+  int i;
+  for(i=0;i<E_LAST;i++){
+    if (sprites.message_icons[i]->width>15 || sprites.message_icons[i]->height>20){
+      sprite_get_bounding_box(sprites.message_icons[i],
+			      &start_x, &start_y, &end_x, &end_y);
+     sprites.message_icons[i]=crop_sprite(sprites.message_icons[i],
+					  start_x, start_y,
+					  end_x-start_x, end_y-start_y); 
+    }
+  }
+  event_sprites_initialized=1;
+}
+
+
+
 /******************************************************************
  Turn off updating of message window
 *******************************************************************/
@@ -122,12 +144,12 @@
 *****************************************************************/
 void create_meswin_dialog(void)
 {
-  static gchar *titles_[1] = { N_("Messages") };
+  static gchar *titles_[2] = { "", N_("Messages") };
   static gchar **titles;
   GtkWidget *scrolled;
   GtkAccelGroup *accel = gtk_accel_group_new();
 
-  if (!titles) titles = intl_slist(1, titles_);
+  if (!titles) titles = intl_slist(2, titles_);
 
   meswin_dialog_shell = gtk_dialog_new();
   gtk_signal_connect( GTK_OBJECT(meswin_dialog_shell),"delete_event",
@@ -136,8 +158,9 @@
 
   gtk_window_set_title( GTK_WINDOW(meswin_dialog_shell), _("Messages") );
 
-  meswin_list = gtk_clist_new_with_titles(1, titles);
+  meswin_list = gtk_clist_new_with_titles(2, titles);
   gtk_clist_column_titles_passive(GTK_CLIST(meswin_list));
+  gtk_clist_set_column_width(GTK_CLIST(meswin_list), 0, 15);
   scrolled = gtk_scrolled_window_new(NULL,NULL);
   gtk_container_add(GTK_CONTAINER(scrolled),meswin_list);
   gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolled ),
@@ -208,6 +231,7 @@
 static int messages_total = 0; /* current total number of message lines */
 static int messages_alloc = 0; /* number allocated for */
 static char **string_ptrs = NULL;
+static struct Sprite **sprite_ptrs = NULL;
 static int *xpos = NULL;
 static int *ypos = NULL;
 static int *event = NULL;
@@ -226,11 +250,13 @@
   if (messages_total+2 > messages_alloc) {
     messages_alloc = messages_total + 32;
     string_ptrs = fc_realloc(string_ptrs, messages_alloc*sizeof(char*));
+    sprite_ptrs = fc_realloc(sprite_ptrs, messages_alloc*sizeof(char*));
     xpos = fc_realloc(xpos, messages_alloc*sizeof(int));
     ypos = fc_realloc(ypos, messages_alloc*sizeof(int));
     event = fc_realloc(event, messages_alloc*sizeof(int));
     for( i=messages_total; i<messages_alloc; i++ ) {
       string_ptrs[i] = NULL;
+      sprite_ptrs[i] = NULL;
       xpos[i] = 0;
       ypos[i] = 0;
       event[i] = E_NOEVENT;
@@ -249,6 +275,7 @@
   for (i = 0; i <messages_total; i++) {
     free(string_ptrs[i]);
     string_ptrs[i] = NULL;
+    sprite_ptrs[i] = NULL;
     xpos[i] = 0;
     ypos[i] = 0;
     event[i] = E_NOEVENT;
@@ -275,6 +302,9 @@
   int gp_len2 = strlen(game_prefix2);
 
   meswin_allocate();
+  if (!event_sprites_initialized){
+    init_event_sprites();
+  }
   s = fc_malloc(strlen(packet->message) + 50);
   if (strncmp(packet->message, game_prefix1, gp_len1) == 0) {
     strcpy(s, packet->message + gp_len1);
@@ -292,6 +322,11 @@
   ypos[messages_total] = packet->y;
   event[messages_total]= packet->event;
   string_ptrs[messages_total] = s;
+  if (packet->event<E_LAST && packet->event>=0){
+    sprite_ptrs[messages_total] = sprites.message_icons[packet->event];
+  }else{
+    sprite_ptrs[messages_total] = sprites.cooling[3];
+  }
   messages_total++;
   string_ptrs[messages_total] = NULL;
   if (!delay_meswin_update) {
@@ -324,6 +359,9 @@
 **************************************************************************/
 void update_meswin_dialog(void)
 {
+  char *row_text[2];
+  row_text[0]="";
+
   if (!meswin_dialog_shell) { 
     if (messages_total > 0 &&
         (!game.player_ptr->ai.control || ai_popup_windows)) {
@@ -334,22 +372,24 @@
       return;
     }
   }
-   if(meswin_dialog_shell) {
-     int i;
-
-     gtk_clist_freeze(GTK_CLIST(meswin_list));
-     gtk_clist_clear(GTK_CLIST(meswin_list));
-
-     for (i=0; i<messages_total; i++)
-     {
-       gtk_clist_append (GTK_CLIST (meswin_list), &string_ptrs[i]);
-       meswin_not_visited_item (i);
-     }
-
-     gtk_clist_thaw(GTK_CLIST(meswin_list));
-     gtk_widget_show_all(meswin_list);
-   }
-
+  if(meswin_dialog_shell) {
+    int i;
+    
+    gtk_clist_freeze(GTK_CLIST(meswin_list));
+    gtk_clist_clear(GTK_CLIST(meswin_list));
+    
+    for (i=0; i<messages_total; i++)
+    {
+      int row;
+      row_text[1]=string_ptrs[i];
+      row = gtk_clist_append (GTK_CLIST (meswin_list), row_text);
+      meswin_not_visited_item (i);
+      gtk_clist_set_pixmap(GTK_CLIST (meswin_list), row, 0,
+			   sprite_ptrs[i]->pixmap, sprite_ptrs[i]->mask);
+    }
+    gtk_clist_thaw(GTK_CLIST(meswin_list));
+    gtk_widget_show_all(meswin_list);
+  }
 }
 
 /**************************************************************************