diff --git a/res/layout/gallery_list_detail_item.xml b/res/layout/gallery_list_detail_item.xml
index ada512b1c..3b8578e84 100644
--- a/res/layout/gallery_list_detail_item.xml
+++ b/res/layout/gallery_list_detail_item.xml
@@ -16,7 +16,6 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/gallery_list_detail"
     android:layout_width="match_parent"
     android:layout_height="wrap_content" >
 
diff --git a/src/com/hippo/ehviewer/ehclient/ExDownloader.java b/src/com/hippo/ehviewer/ehclient/ExDownloader.java
index 30514317a..d820d3ce6 100644
--- a/src/com/hippo/ehviewer/ehclient/ExDownloader.java
+++ b/src/com/hippo/ehviewer/ehclient/ExDownloader.java
@@ -218,7 +218,7 @@ public class ExDownloader implements Runnable {
                 setStartIndex(0);
                 if (mDownloadIndexSet == null)
                     mDownloadIndexSet = new HashSet<Integer>();
-                if (mLfd != null)
+                if (mDownloadMode && mLfd != null)
                     mLfd.onStart(mGid);
             } else {
                 mDownloadIndexSet = null;
@@ -523,7 +523,8 @@ public class ExDownloader implements Runnable {
                 getDetailInfo(0, ediFile, true);
             }
 
-            mLfd.onGetSum(mGid, mImageNum);
+            if (mLfd != null)
+                mLfd.onGetSum(mGid, mImageNum);
 
             ensureWorkers();
 
diff --git a/src/com/hippo/ehviewer/gallery/data/ImageSet.java b/src/com/hippo/ehviewer/gallery/data/ImageSet.java
index 3abc742b9..dcbbceb09 100644
--- a/src/com/hippo/ehviewer/gallery/data/ImageSet.java
+++ b/src/com/hippo/ehviewer/gallery/data/ImageSet.java
@@ -95,8 +95,8 @@ public class ImageSet implements ExDownloader.ListenerForImageSet {
         // Init ExDownloader
         mEdManager = ExDownloaderManager.getInstance();
         mExDownloader = mEdManager.getExDownloader(gid, token, title, Config.getMode());
-        mExDownloader.setStartIndex(startIndex);
         mExDownloader.setListenerForImageSet(this);
+        mExDownloader.setStartIndex(startIndex);
 
         mImageFilenameArray = mExDownloader.getImageFilenameArray();
 
diff --git a/src/com/hippo/ehviewer/widget/GalleryListView.java b/src/com/hippo/ehviewer/widget/GalleryListView.java
index cd46ec803..e664e83e9 100644
--- a/src/com/hippo/ehviewer/widget/GalleryListView.java
+++ b/src/com/hippo/ehviewer/widget/GalleryListView.java
@@ -221,14 +221,14 @@ public class GalleryListView extends FrameLayout implements RefreshLayout.OnFoot
     public void setPaddingTopAndBottom(int top, int bottom) {
         setPadding(getPaddingLeft(), top, getPaddingRight(), getPaddingBottom());
         mEasyRecyclerView.setPadding(mEasyRecyclerView.getPaddingLeft(), mEasyRecyclerView.getPaddingTop(),
-                mEasyRecyclerView.getPaddingRight(), bottom);
+                mEasyRecyclerView.getPaddingRight(), mEasyRecyclerView.getPaddingBottom() + bottom);
     }
 
     private void setItemMargin(int margin) {
         int halfMargin = margin / 2;
         mItemDecoration.setMargin(margin);
         mEasyRecyclerView.setPadding(halfMargin, halfMargin,
-                halfMargin, mEasyRecyclerView.getPaddingBottom());
+                halfMargin, halfMargin);
     }
 
     public void setEnabledHeader(boolean enabled) {