diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d10d02fb..896bb55c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="37"
-    android:versionName="0.3.4" >
+    android:versionCode="38"
+    android:versionName="0.3.5" >
 
     <uses-sdk android:minSdkVersion="4" />
 
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 3310dcd2..4daab3da 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -386,6 +386,8 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		initDatabase();
+
 		m_prefs = PreferenceManager
 				.getDefaultSharedPreferences(getApplicationContext());
 
@@ -433,8 +435,6 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 
 		setContentView(R.layout.main);
 
-		initDatabase();
-
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(OfflineDownloadService.INTENT_ACTION_SUCCESS);
 		filter.addAction(OfflineUploadService.INTENT_ACTION_SUCCESS);
diff --git a/src/org/fox/ttrss/OfflineActivity.java b/src/org/fox/ttrss/OfflineActivity.java
index 54b62fb4..51cdf911 100644
--- a/src/org/fox/ttrss/OfflineActivity.java
+++ b/src/org/fox/ttrss/OfflineActivity.java
@@ -54,6 +54,8 @@ public class OfflineActivity extends FragmentActivity implements
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
+		initDatabase();
+
 		m_prefs = PreferenceManager
 				.getDefaultSharedPreferences(getApplicationContext());
 
@@ -97,8 +99,6 @@ public class OfflineActivity extends FragmentActivity implements
 
 		setContentView(R.layout.main);
 
-		initDatabase();
-
 		Log.d(TAG, "m_smallScreenMode=" + m_smallScreenMode);
 		Log.d(TAG, "m_compatMode=" + m_compatMode);
 
@@ -236,7 +236,7 @@ public class OfflineActivity extends FragmentActivity implements
 	@Override
 	public void onResume() {
 		super.onResume();
-
+		
 		boolean needRefresh = !m_prefs.getString("theme", "THEME_DARK").equals(
 				m_themeName)
 				|| m_prefs.getBoolean("enable_cats", false) != m_enableCats;