diff --git a/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java b/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java
index 3ef74fd4..8a15966e 100644
--- a/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java
+++ b/app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java
@@ -107,7 +107,7 @@ public class NotificationSchedulerJobTask extends JobService {
         Bitmap largeIcon = BitmapFactory.decodeResource(context.getResources(),
                 R.mipmap.ic_launcher);
         int primaryColor = ViewHelper.getPrimaryColor(context);
-        android.app.Notification grouped = getNotification(getString(R.string.notifications), getString(R.string.no_unread_notifications))
+        android.app.Notification grouped = getNotification(getString(R.string.notifications), getString(R.string.unread_notification))
                 .setLargeIcon(largeIcon)
                 .setGroup(NOTIFICATION_GROUP_ID)
                 .setGroupSummary(true)
diff --git a/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsView.java b/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsView.java
index 003c89a2..33481389 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/feeds/FeedsView.java
@@ -84,9 +84,19 @@ public class FeedsView extends BaseFragment<FeedsMvp.View, FeedsPresenter> imple
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
+        hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @Override public void onOpenRepoChooser(@NonNull ArrayList<SimpleUrlsModel> models) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/GistsView.java b/app/src/main/java/com/fastaccess/ui/modules/gists/GistsView.java
index b0257f05..2a3c064d 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/gists/GistsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/gists/GistsView.java
@@ -74,10 +74,19 @@ public class GistsView extends BaseFragment<GistsMvp.View, GistsPresenter> imple
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @NonNull @Override public GistsPresenter providePresenter() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsView.java b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsView.java
index 98a6d12b..aa822460 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/comments/GistCommentsView.java
@@ -91,9 +91,18 @@ public class GistCommentsView extends BaseFragment<GistCommentsMvp.View, GistCom
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @NonNull @Override public GistCommentsPresenter providePresenter() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesView.java b/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesView.java
index cd68a069..e2fffc3c 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/main/issues/MyIssuesView.java
@@ -78,9 +78,18 @@ public class MyIssuesView extends BaseFragment<MyIssuesMvp.View, MyIssuesPresent
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @NonNull @Override public OnLoadMore<IssueState> getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestView.java b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestView.java
index fb63b09f..ed052c11 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/main/pullrequests/MyPullRequestView.java
@@ -78,9 +78,18 @@ public class MyPullRequestView extends BaseFragment<MyPullRequestsMvp.View, MyPu
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @NonNull @Override public OnLoadMore<IssueState> getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsView.java b/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsView.java
index 888696fd..58f45c56 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationsView.java
@@ -113,10 +113,19 @@ public class NotificationsView extends BaseFragment<NotificationsMvp.View, Notif
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersView.java
index d1cbe8a1..d27bdc47 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/profile/followers/ProfileFollowersView.java
@@ -79,10 +79,19 @@ public class ProfileFollowersView extends BaseFragment<ProfileFollowersMvp.View,
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @NonNull @Override public OnLoadMore<String> getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingView.java
index b84dae2a..b76d23a5 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/profile/following/ProfileFollowingView.java
@@ -79,10 +79,19 @@ public class ProfileFollowingView extends BaseFragment<ProfileFollowingMvp.View,
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @NonNull @Override public OnLoadMore<String> getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsView.java
index 927429c7..ad35a6d3 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/profile/gists/ProfileGistsView.java
@@ -84,10 +84,19 @@ public class ProfileGistsView extends BaseFragment<ProfileGistsMvp.View, Profile
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @NonNull @Override public ProfileGistsPresenter providePresenter() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java
index 4641b5ab..967bd864 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/profile/overview/ProfileOverviewView.java
@@ -155,9 +155,18 @@ public class ProfileOverviewView extends BaseFragment<ProfileOverviewMvp.View, P
         progress.setVisibility(View.GONE);
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        onHideProgress();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        onHideProgress();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void onHideProgress() {
         hideProgress();
-        super.showErrorMessage(msgRes);
     }
 
     private boolean isMeOrOrganization() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposView.java
index 1542aaa4..7e0125b0 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/profile/repos/ProfileReposView.java
@@ -79,10 +79,19 @@ public class ProfileReposView extends BaseFragment<ProfileReposMvp.View, Profile
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @NonNull @Override public OnLoadMore<String> getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredView.java b/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredView.java
index dc952cc7..c41d772e 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/profile/starred/ProfileStarredView.java
@@ -69,7 +69,6 @@ public class ProfileStarredView extends BaseFragment<ProfileStarredMvp.View, Pro
         return new ProfileStarredPresenter();
     }
 
-
     @Override public void showProgress(@StringRes int resId) {
 
         stateLayout.showProgress();
@@ -80,12 +79,20 @@ public class ProfileStarredView extends BaseFragment<ProfileStarredMvp.View, Pro
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
-        hideProgress();
-        stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
     }
 
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
+        hideProgress();
+        stateLayout.showReload(adapter.getItemCount());
+    }
 
     @NonNull @Override public OnLoadMore<String> getLoadMore() {
         if (onLoadMore == null) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/RepoCommitsView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/RepoCommitsView.java
index 0903e819..f25a5829 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/RepoCommitsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/RepoCommitsView.java
@@ -118,11 +118,20 @@ public class RepoCommitsView extends BaseFragment<RepoCommitsMvp.View, RepoCommi
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
-        hideProgress();
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideBranchesProgress();
+        hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @SuppressWarnings("unchecked") @NonNull @Override public OnLoadMore getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/comments/CommitCommentsView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/comments/CommitCommentsView.java
index c52beed4..7cf5a83b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/comments/CommitCommentsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/comments/CommitCommentsView.java
@@ -89,9 +89,18 @@ public class CommitCommentsView extends BaseFragment<CommitCommentsMvp.View, Com
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @NonNull @Override public CommitCommentsPresenter providePresenter() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsView.java
index 9a6582af..d9b23a95 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/contributors/RepoContributorsView.java
@@ -82,10 +82,19 @@ public class RepoContributorsView extends BaseFragment<RepoContributorsMvp.View,
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @SuppressWarnings("unchecked") @NonNull @Override public OnLoadMore getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/files/RepoFilesView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/files/RepoFilesView.java
index 14338ede..290acb9e 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/files/RepoFilesView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/files/RepoFilesView.java
@@ -142,10 +142,19 @@ public class RepoFilesView extends BaseFragment<RepoFilesMvp.View, RepoFilesPres
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @NonNull @Override public RepoFilesPresenter providePresenter() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/files/paths/RepoFilePathView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/files/paths/RepoFilePathView.java
index 7035bcd5..626dfa7e 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/files/paths/RepoFilePathView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/files/paths/RepoFilePathView.java
@@ -161,9 +161,18 @@ public class RepoFilePathView extends BaseFragment<RepoFilePathMvp.View, RepoFil
         branchesProgress.setVisibility(View.GONE);
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
-        super.showErrorMessage(msgRes);
     }
 
     @Override public void setBranchesData(@NonNull List<BranchesModel> branchesData, boolean firstTime) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerView.java
index 4b2ec687..7c35464e 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerView.java
@@ -95,6 +95,11 @@ public class ViewerView extends BaseFragment<ViewerMvp.View, ViewerPresenter> im
         super.showErrorMessage(msgRes);
     }
 
+    @Override public void showMessage(int titleRes, int msgRes) {
+        stateLayout.hideProgress();
+        super.showMessage(titleRes, msgRes);
+    }
+
     @Override protected int fragmentLayout() {
         return R.layout.general_viewer_layout;
     }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesView.java
index f524f0e0..0d8daa7f 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/releases/RepoReleasesView.java
@@ -119,10 +119,19 @@ public class RepoReleasesView extends BaseFragment<RepoReleasesMvp.View, RepoRel
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @Override public void onDownload(@NonNull Release item) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java
index 92407a64..5f0f4e3e 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java
@@ -111,10 +111,19 @@ public class MilestoneView extends BaseFragment<MilestoneMvp.View, MilestonePres
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @NonNull @Override public MilestonePresenter providePresenter() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoClosedIssuesView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoClosedIssuesView.java
index e20b4a99..f5d25d71 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoClosedIssuesView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoClosedIssuesView.java
@@ -100,9 +100,18 @@ public class RepoClosedIssuesView extends BaseFragment<RepoIssuesMvp.View, RepoI
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @NonNull @Override public OnLoadMore<IssueState> getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoOpenedIssuesView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoOpenedIssuesView.java
index 7e2d1b5c..3947e40a 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoOpenedIssuesView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/RepoOpenedIssuesView.java
@@ -120,9 +120,18 @@ public class RepoOpenedIssuesView extends BaseFragment<RepoIssuesMvp.View, RepoI
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @NonNull @Override public OnLoadMore<IssueState> getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/comments/IssueCommentsView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/comments/IssueCommentsView.java
index 930237ea..034cc66f 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/comments/IssueCommentsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/comments/IssueCommentsView.java
@@ -90,9 +90,18 @@ public class IssueCommentsView extends BaseFragment<IssueCommentsMvp.View, Issue
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @NonNull @Override public IssueCommentsPresenter providePresenter() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/events/IssueDetailsView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/events/IssueDetailsView.java
index c39f0be5..f262970d 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/events/IssueDetailsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/events/IssueDetailsView.java
@@ -79,10 +79,19 @@ public class IssueDetailsView extends BaseFragment<IssueDetailsMvp.View, IssueDe
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @SuppressWarnings("unchecked") @NonNull @Override public OnLoadMore getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestView.java
index fb2bf6b5..1f9b9d9a 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/RepoPullRequestView.java
@@ -105,9 +105,18 @@ public class RepoPullRequestView extends BaseFragment<RepoPullRequestMvp.View, R
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @NonNull @Override public OnLoadMore<IssueState> getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsView.java
index 73ef681c..f3d00efc 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/commits/PullRequestCommitsView.java
@@ -84,10 +84,19 @@ public class PullRequestCommitsView extends BaseFragment<PullRequestCommitsMvp.V
         stateLayout.hideProgress();
     }
 
-    @Override public void showErrorMessage(@NonNull String msgRes) {
+    @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(msgRes);
     }
 
     @SuppressWarnings("unchecked") @NonNull @Override public OnLoadMore getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/events/PullRequestDetailsView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/events/PullRequestDetailsView.java
index f361c508..177e981b 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/events/PullRequestDetailsView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/pull_requests/pull_request/details/events/PullRequestDetailsView.java
@@ -81,9 +81,18 @@ public class PullRequestDetailsView extends BaseFragment<PullRequestDetailsMvp.V
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @SuppressWarnings("unchecked") @NonNull @Override public OnLoadMore getLoadMore() {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeView.java b/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeView.java
index ca6d07d9..b9e4aac9 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/search/code/SearchCodeView.java
@@ -79,9 +79,18 @@ public class SearchCodeView extends BaseFragment<SearchCodeMvp.View, SearchCodeP
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @Override public void onSetSearchQuery(@NonNull String query) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesView.java b/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesView.java
index d7d7f375..28cd3ed6 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/search/issues/SearchIssuesView.java
@@ -77,9 +77,18 @@ public class SearchIssuesView extends BaseFragment<SearchIssuesMvp.View, SearchI
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @Override public void onSetSearchQuery(@NonNull String query) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposView.java b/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposView.java
index 671addf8..d6fcba1d 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/search/repos/SearchReposView.java
@@ -77,9 +77,18 @@ public class SearchReposView extends BaseFragment<SearchReposMvp.View, SearchRep
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @Override public void onSetSearchQuery(@NonNull String query) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersView.java b/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersView.java
index 29eb1d8f..03bd0f4f 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/search/users/SearchUsersView.java
@@ -76,9 +76,18 @@ public class SearchUsersView extends BaseFragment<SearchUsersMvp.View, SearchUse
     }
 
     @Override public void showErrorMessage(@NonNull String message) {
+        showReload();
+        super.showErrorMessage(message);
+    }
+
+    @Override public void showMessage(int titleRes, int msgRes) {
+        showReload();
+        super.showMessage(titleRes, msgRes);
+    }
+
+    private void showReload() {
         hideProgress();
         stateLayout.showReload(adapter.getItemCount());
-        super.showErrorMessage(message);
     }
 
     @Override public void onSetSearchQuery(@NonNull String query) {