diff --git a/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java b/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
index eed6df7a3..d680548e4 100644
--- a/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
@@ -160,13 +160,19 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
                     AutoCompleteTextView instance_list = dialogView.findViewById(R.id.search_instance);
                     //Manage download of attachments
                     RadioGroup radioGroup = dialogView.findViewById(R.id.set_attachment_group);
-
+                    radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
+                        if( checkedId == R.id.twitter_accounts){
+                            instance_list.setHint(R.string.list_of_twitter_accounts);
+                        }else {
+                            instance_list.setHint(R.string.instance);
+                        }
+                    });
                     instance_list.setFilters(new InputFilter[]{new InputFilter.LengthFilter(60)});
                     dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int id) {
                             SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-                            String instanceName = instance_list.getText().toString().trim();
+                            String instanceName = instance_list.getText().toString().trim().replace("@","");
                             new Thread(new Runnable() {
                                 @Override
                                 public void run() {
@@ -196,6 +202,8 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
                                                     new InstancesDAO(ReorderTimelinesActivity.this, db).insertInstance(instanceName, "MISSKEY");
                                                 } else if (radioGroup.getCheckedRadioButtonId() == R.id.gnu_instance) {
                                                     new InstancesDAO(ReorderTimelinesActivity.this, db).insertInstance(instanceName, "GNU");
+                                                }else if (radioGroup.getCheckedRadioButtonId() == R.id.twitter_accounts) {
+                                                    new InstancesDAO(ReorderTimelinesActivity.this, db).insertInstance(instanceName, "NITTER");
                                                 }
                                                 if (timelines != null && adapter != null) {
                                                     List<RemoteInstance> instance = new InstancesDAO(ReorderTimelinesActivity.this, db).getInstanceByName(instanceName);
diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
index 428d154f8..1cfbdfd52 100644
--- a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
+++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
@@ -114,23 +114,22 @@ public class LiveNotificationDelayedService extends Service {
                 }
             }
         }
+        Intent myIntent = new Intent(getApplicationContext(), MainActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(
+                getApplicationContext(),
+                0,
+                myIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
 
+        android.app.Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
+                .setShowWhen(false)
+                .setContentIntent(pendingIntent)
+                .setContentTitle(getString(R.string.top_notification))
+                .setSmallIcon(getNotificationIcon(getApplicationContext()))
+                .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
+
+        startForeground(1, notification);
         if (totalAccount > 0) {
-            Intent myIntent = new Intent(getApplicationContext(), MainActivity.class);
-            PendingIntent pendingIntent = PendingIntent.getActivity(
-                    getApplicationContext(),
-                    0,
-                    myIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT);
-
-            android.app.Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
-                    .setShowWhen(false)
-                    .setContentIntent(pendingIntent)
-                    .setContentTitle(getString(R.string.top_notification))
-                    .setSmallIcon(getNotificationIcon(getApplicationContext()))
-                    .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
-
-            startForeground(1, notification);
             startStream();
         } else {
             stopSelf();
diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
index 63523f6aa..3dbf122f8 100644
--- a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
+++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
@@ -137,21 +137,20 @@ public class LiveNotificationService extends Service implements NetworkStateRece
                 }
             }
         }
-        if (totalAccount > 0) {
-            Intent myIntent = new Intent(getApplicationContext(), MainActivity.class);
-            PendingIntent pendingIntent = PendingIntent.getActivity(
-                    getApplicationContext(),
-                    0,
-                    myIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT);
-            android.app.Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
-                    .setContentTitle(getString(R.string.top_notification))
-                    .setContentIntent(pendingIntent)
-                    .setSmallIcon(getNotificationIcon(getApplicationContext()))
-                    .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
+        Intent myIntent = new Intent(getApplicationContext(), MainActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(
+                getApplicationContext(),
+                0,
+                myIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+        android.app.Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
+                .setContentTitle(getString(R.string.top_notification))
+                .setContentIntent(pendingIntent)
+                .setSmallIcon(getNotificationIcon(getApplicationContext()))
+                .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
 
-            startForeground(1, notification);
-        } else {
+        startForeground(1, notification);
+        if (totalAccount == 0) {
             stopSelf();
         }
     }
diff --git a/app/src/main/res/layout/search_instance.xml b/app/src/main/res/layout/search_instance.xml
index dad799b6b..edfa92163 100644
--- a/app/src/main/res/layout/search_instance.xml
+++ b/app/src/main/res/layout/search_instance.xml
@@ -48,5 +48,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/gnu_instance" />
+        <RadioButton
+            android:id="@+id/twitter_accounts"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/twitter_accounts" />
     </RadioGroup>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b8964c7d..2e240d345 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1205,4 +1205,6 @@
     <string name="action_trends">Trends</string>
     <string name="trending_now">Trending now</string>
     <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
 </resources>
\ No newline at end of file