diff --git a/CHANGELOG b/CHANGELOG
index ff98a42b..9ccaee69 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,3 +50,6 @@ be deleted. Thanks again to lukeman.
 
 2010-01-31 r155 Fix bug caused by issue #129 - ticket followup titles being 
 set incorrectly. Thanks to Lukeman for the fix.
+
+2010-07-16 r157 Fix issues #141, #142 - IMAP infinite loops and ticket 
+pagination issues. Thanks to Walter Doekes for the patches.
diff --git a/templates/helpdesk/ticket_list.html b/templates/helpdesk/ticket_list.html
index 43958d78..576708e8 100644
--- a/templates/helpdesk/ticket_list.html
+++ b/templates/helpdesk/ticket_list.html
@@ -200,7 +200,7 @@ $(document).ready(function() {
 <div class="pagination">
     <span class="step-links">
         {% if tickets.has_previous %}
-            <a href="?{{ query_string }}{% if query_string %}&{% else %}?{% endif %}page={{ tickets.previous_page_number }}">{% trans "Previous" %}</a>
+            <a href="?{% if query_string %}{{ query_string }}&amp;{% endif %}page={{ tickets.previous_page_number }}">{% trans "Previous" %}</a>
         {% endif %}
 
         <span class="current">
@@ -208,7 +208,7 @@ $(document).ready(function() {
         </span>
 
         {% if tickets.has_next %}
-            <a href="?{{ query_string }}{% if query_string %}&{% else %}?{% endif %}page={{ tickets.next_page_number }}">{% trans "Next" %}</a>
+            <a href="?{% if query_string %}{{ query_string }}&amp;{% endif %}page={{ tickets.next_page_number }}">{% trans "Next" %}</a>
         {% endif %}
     </span>
 </div>