diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1a777dc27d..02de5f7462 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-29  Dan Winship  <danw@ximian.com>
+
+	* mail-display.c (pixmap_press): Ignore "funky" button clicks
+	(like scroll wheel scrolls)
+
 2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* *.*: Cleaned up #includes. Remove unneccesary includes of
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 5a405abdf2..29618cc353 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -314,6 +314,12 @@ pixmap_press (GtkWidget *widget, GdkEventButton *event, EScrollFrame *user_data)
 	}
 #endif
 
+	if (event->button != 1 && event->button != 3) {
+		gtk_propagate_event (GTK_WIDGET (user_data),
+				     (GdkEvent *)event);
+		return TRUE;
+	}
+
 	part = gtk_object_get_data (GTK_OBJECT (widget), "CamelMimePart");
 	handler = mail_lookup_handler (gtk_object_get_data (GTK_OBJECT (widget),
 							    "mime_type"));