diff --git a/apps/susimail/src/src/i2p/susi/util/Folder.java b/apps/susimail/src/src/i2p/susi/util/Folder.java
index a6798c2af..81fad05ff 100644
--- a/apps/susimail/src/src/i2p/susi/util/Folder.java
+++ b/apps/susimail/src/src/i2p/susi/util/Folder.java
@@ -176,11 +176,14 @@ public class Folder<O extends Object> {
 	 */
 	public void setElements( O[] elements )
 	{
-		this.unsortedElements = elements;
-		if( currentSorter != null )
-			sort();
-		else
-			this.elements = elements;
+		if (elements.length > 0) {
+			this.unsortedElements = elements;
+			if( currentSorter != null )
+				sort();
+			else
+				this.elements = elements;
+		} else
+			this.elements = null;
 		update();
 	}
 	
diff --git a/history.txt b/history.txt
index 1b089b532..6748a3869 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,7 @@
 2014-01-09 str4d
- * susimail: UTF-8 support from wockenfuss (ticket #508)
+ * susimail:
+  - Fixed pagination with zero entries (ticket #1168)
+  - UTF-8 support from wockenfuss (ticket #508)
  * Console: Fixed overlapping text issue in midnight theme
 
 2014-01-04 zzz