diff --git a/ChangeLog b/ChangeLog
index 9c444503e..bdad3e4a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-27  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/SOGoAutoCompletion.js
+	(performSearchCallback): minor change on when the popup menu has
+	to be positioned differently.
+
 2010-07-22  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Added Migration/Horde/* - scripts used to migrate
diff --git a/UI/WebServerResources/SOGoAutoCompletion.js b/UI/WebServerResources/SOGoAutoCompletion.js
index 38c267f0d..4b17e8b89 100644
--- a/UI/WebServerResources/SOGoAutoCompletion.js
+++ b/UI/WebServerResources/SOGoAutoCompletion.js
@@ -192,12 +192,11 @@ var SOGoAutoCompletionInterface = {
                     }
 
                     // Show popup menu
-                    var div = Element.up(input, 'DIV');
                     var offsetScroll = Element.cumulativeScrollOffset(input);
                     var offset = Element.positionedOffset(input);
-                    if (div.getStyle('position') == 'relative')
-                        // Hack for some situations where the offset must be computed differently
-                        offset = Element.cumulativeOffset(input);
+                    if ($(document.body).hasClassName("popup") && typeof initPopupMailer == 'undefined')
+                    // Hack for some situations where the offset must be computed differently
+                         offset = Element.cumulativeOffset(input);
                     var top = offset.top - offsetScroll.top + node.offsetHeight + 3;
                     var height = 'auto';
                     var heightDiff = window.height() - offset[1];