diff --git a/extensions/amavis_quarantine/sql_listing.py b/extensions/amavis_quarantine/sql_listing.py
index d10c83e80..57edf6619 100644
--- a/extensions/amavis_quarantine/sql_listing.py
+++ b/extensions/amavis_quarantine/sql_listing.py
@@ -70,7 +70,7 @@ SELECT msgs.from_addr, maddr.email, msgs.subject, msgs.content, quarantine.mail_
        msgs.time_num, msgs.content, msgrcpt.rs
 %s
 LIMIT %d,%d
-""" % (query, start - 1, stop - 1))
+""" % (query, start - 1, kwargs["nbelems"]))
         if not status:
             print cursor
             return []
diff --git a/lib/email_listing.py b/lib/email_listing.py
index 05fab0610..d73f6d86f 100644
--- a/lib/email_listing.py
+++ b/lib/email_listing.py
@@ -109,7 +109,8 @@ class EmailListing:
     
     def fetch(self, request, id_start, id_stop):
         table = self.tbltype(self.mbc.fetch(start=id_start, stop=id_stop, 
-                                            folder=self.folder))
+                                            folder=self.folder, 
+                                            nbelems=self.elems_per_page))
         tpl = Template("""
 <form method="POST" id="listingform">
   {{ table }}