diff --git a/ChangeLog b/ChangeLog
index 3d68b26e40..6016cb4a13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-08-11  Michael Natterer  <mitch@imendio.com>
+
+	Bug 546754 – 2.13.6 update create rendering issue in the evolution
+	composer
+
+	* gtk/gtkadjustment.c: instead of CLAMP(), use
+
+	value = MIN (value, upper - page_size);
+	value = MAX (value, lower);
+
+	so we don't end up below lower if upper - page_size is smaller
+	than lower.
+
 2008-08-11  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 546616 – CUPS print backend uses 1.2 API without guards
diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c
index 16e76ede8e..dd1b3f609d 100644
--- a/gtk/gtkadjustment.c
+++ b/gtk/gtkadjustment.c
@@ -359,7 +359,11 @@ gtk_adjustment_set_value (GtkAdjustment *adjustment,
 {
   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
-  value = CLAMP (value, adjustment->lower, adjustment->upper - adjustment->page_size);
+  /* don't use CLAMP() so we don't end up below lower if upper - page_size
+   * is smaller than lower
+   */
+  value = MIN (value, adjustment->upper - adjustment->page_size);
+  value = MAX (value, adjustment->lower);
 
   if (value != adjustment->value)
     {
@@ -628,7 +632,11 @@ gtk_adjustment_configure (GtkAdjustment *adjustment,
                 "page-size", page_size,
                 NULL);
 
-  value = CLAMP (value, lower, upper - page_size);
+  /* don't use CLAMP() so we don't end up below lower if upper - page_size
+   * is smaller than lower
+   */
+  value = MIN (value, upper - page_size);
+  value = MAX (value, lower);
 
   if (value != adjustment->value)
     {