diff --git a/src/com/b44t/messenger/DcChatlist.java b/src/com/b44t/messenger/DcChatlist.java
index a7a8c7a5e..84bbfbd35 100644
--- a/src/com/b44t/messenger/DcChatlist.java
+++ b/src/com/b44t/messenger/DcChatlist.java
@@ -36,18 +36,9 @@ public class DcChatlist {
     }
 
     public native int getCnt();
-
-    public DcChat getChatByIndex(int index) {
-        return new DcChat(DcChatlistGetChatByIndex(m_hChatlist, index));
-    }
-
-    public DcMsg getMsgByIndex(int index) {
-        return new DcMsg(DcChatlistGetMsgByIndex(m_hChatlist, index));
-    }
-
-    public DcLot getSummaryByIndex(int index, DcChat chat) {
-        return new DcLot(DcChatlistGetSummaryByIndex(m_hChatlist, index, chat.getCPtr()));
-    }
+    public DcChat getChatByIndex(int index) { return new DcChat(DcChatlistGetChatByIndex(m_hChatlist, index)); }
+    public DcMsg getMsgByIndex(int index) { return new DcMsg(DcChatlistGetMsgByIndex(m_hChatlist, index)); }
+    public DcLot getSummaryByIndex(int index, DcChat chat) { return new DcLot(DcChatlistGetSummaryByIndex(m_hChatlist, index, chat==null? null : chat.getCPtr())); }
 
     // working with raw c-data
     private long m_hChatlist; // must not be renamed as referenced by JNI