diff --git a/ChangeLog b/ChangeLog
index 47fce2a815..fa6981f257 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-16  Herbert Thoma  <herbie@hthoma.de>
+
+	* src/gnome/gnc-split-reg.c:
+	  only display an euro amount in the status bar of a register window
+	  if the account currency is a euro currency but NOT euro itself
+
+	* src/gnome-utils/gnc-account-tree.c:
+	  auto resize balance and total columns
+	
 2003-02-15  Derek Atkins  <derek@ihtfp.com>
 
 	* src/import-export/qif-import/qif-file.scm:
diff --git a/src/gnome-utils/gnc-account-tree.c b/src/gnome-utils/gnc-account-tree.c
index 5c0fa5afd3..4f3b2001ce 100644
--- a/src/gnome-utils/gnc-account-tree.c
+++ b/src/gnome-utils/gnc-account-tree.c
@@ -189,6 +189,14 @@ gnc_account_tree_init (GNCAccountTree *tree)
   gtk_clist_set_column_auto_resize(GTK_CLIST(tree), 0, TRUE);
   gtk_clist_set_column_auto_resize(GTK_CLIST(tree),
                                    tree->description_column, TRUE );
+  gtk_clist_set_column_auto_resize(GTK_CLIST(tree),
+                                   tree->balance_column, TRUE );
+  gtk_clist_set_column_auto_resize(GTK_CLIST(tree),
+                                   tree->balance_column + 1, TRUE );
+  gtk_clist_set_column_auto_resize(GTK_CLIST(tree),
+                                   tree->total_column, TRUE );
+  gtk_clist_set_column_auto_resize(GTK_CLIST(tree),
+                                   tree->total_column + 1, TRUE );
 
   gtk_clist_set_column_justification(GTK_CLIST(tree),
 				     tree->balance_column,
diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c
index a22bcf59f0..f1ade9fbc7 100644
--- a/src/gnome/gnc-split-reg.c
+++ b/src/gnome/gnc-split-reg.c
@@ -671,7 +671,8 @@ gsr_redraw_all_cb (GnucashRegister *g_reg, gpointer data)
 
   /* no EURO converson, if account is already EURO or no EURO currency */
   if (commodity != NULL)
-    euro = (euro && gnc_is_euro_currency( commodity ));
+    euro = (euro && gnc_is_euro_currency( commodity ) && 
+            (strncasecmp(gnc_commodity_get_mnemonic(commodity), "EUR", 3)));
   else
     euro = FALSE;