diff --git a/TODO.catalogs b/TODO.catalogs
index a1aae0937..799442ecd 100644
--- a/TODO.catalogs
+++ b/TODO.catalogs
@@ -1,3 +1,7 @@
+* ISSUES:
+** do not use NetworkLibrary instance in AllCatalogsActivity, send result via intent
+** do not use myChanged state flag in AllCatalogsActivity, use setResult immediately
+
 * SHORT-TERM (1.8.3)
  + check recently added catalogs are not lost (and are visible) after update
  + newly added catalog is not checked in filter activity
diff --git a/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java b/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java
index baa4aad79..64d51925d 100644
--- a/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java
@@ -47,7 +47,7 @@ public class AllCatalogsActivity extends ListActivity {
 	protected void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
 
-		Intent intent = getIntent();
+		final Intent intent = getIntent();
 		myIds = intent.getStringArrayListExtra(IDS_LIST);
 		myInactiveIds = intent.getStringArrayListExtra(INACTIVE_IDS_LIST);
 	}
@@ -193,6 +193,7 @@ public class AllCatalogsActivity extends ListActivity {
 					public void onClick(View v) {
 						catalogItem.IsChecked = checkBox.isChecked();
 						myIsChanged = true;
+						setResult(... Intent)
 					}
 				});
 			}