diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index e8ec12a..836f871 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java
index be171d9..602d15d 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java
@@ -246,16 +246,26 @@ public class StateMessagesActivity extends AppCompatActivity {
                     String humanStatusValue = humanStatus.getText().toString();
                     switch (humanStatusValue) {
                         case "Fixed":
-                        case "Scheduled":
                             humanStatus.setTextColor(Color.GREEN);
+                            humanStatus.setText(R.string.Fixed);
+                            scheduled.setVisibility(View.GONE  );
+                            break;
+                        case "Scheduled":
+                            humanStatus.setTextColor(Color.YELLOW);
                             humanStatus.setText(R.string.Scheduled);
+                            scheduled.setVisibility(View.VISIBLE  );
                             break;
                         case "Investigating":
+                            humanStatus.setTextColor(Color.RED);
+                            scheduled.setVisibility(View.GONE  );
+                            break;
                         case "Watching":
+                            scheduled.setVisibility(View.GONE  );
                             humanStatus.setTextColor(Color.YELLOW);
                             humanStatus.setText(R.string.Investigating);
                             break;
                         case "Identified":
+                            scheduled.setVisibility(View.GONE  );
                             humanStatus.setTextColor(Color.RED);
                             humanStatus.setText(R.string.Identified);
                             break;
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 14b2324..d2ee91b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -169,5 +169,6 @@
     <string name="devsTitle">Entwickler:</string>
     <string name="translatorsTitle">Übersetzer:</string>
     <string name="artworksTitle">Künstlerische Gestaltung:</string>
+    <string name="Fixed">Behoben</string>
 
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 13f27be..fd2400e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -178,4 +178,5 @@
     <string name="devsTitle">Desalloradorxs:</string>
     <string name="translatorsTitle">Traductorxs:</string>
     <string name="artworksTitle">Arte:</string>
+    <string name="Fixed">Arreglado</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fe9ae53..b6d8c80 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -215,4 +215,5 @@
     <string name="devsTitle">Développeurs:</string>
     <string name="translatorsTitle">Traducteurs:</string>
     <string name="artworksTitle">Illustrations:</string>
+    <string name="Fixed">Résolu</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ffc1ccc..a687357 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -166,4 +166,5 @@
     <string name="devsTitle">Sviluppatori:</string>
     <string name="translatorsTitle">Traduttori:</string>
     <string name="artworksTitle">Artwork:</string>
+    <string name="Fixed">Risolto</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 15157cb..1a85440 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -179,4 +179,5 @@
     <string name="devsTitle">Ontwikkelaars:</string>
     <string name="translatorsTitle">Vertalers:</string>
     <string name="artworksTitle">Artwork:</string>
+    <string name="Fixed">Opgelost</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index fdd6966..8bcd922 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -177,4 +177,5 @@
     <string name="devsTitle">Programadores:</string>
     <string name="translatorsTitle">Tradutores:</string>
     <string name="artworksTitle">Desenho:</string>
+    <string name="Fixed">Resolvido</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 866214f..305820a 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -178,4 +178,5 @@
     <string name="devsTitle">Programeri:</string>
     <string name="translatorsTitle">Prevodioci:</string>
     <string name="artworksTitle">Crteži:</string>
+    <string name="Fixed">Fixed</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b6883a..018de1a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,4 +174,5 @@
     <string name="devsTitle">Developers:</string>
     <string name="translatorsTitle">Translators:</string>
     <string name="artworksTitle">Artwork:</string>
+    <string name="Fixed">Risolto</string>
 </resources>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index c34ea91..9e9bfb4 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+  <release version="2.0.1" versioncode="24" >
+      <change>Filtered scheduled_at to be shown only on planned issue</change>
+  </release>
     <release version="2.0.0" versioncode="23" >
         <change>New theme and icon sets</change>
         <change>New settings menu</change>