diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java
index 617371c5f8c..36805ce54a8 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPrompt.java
@@ -157,9 +157,7 @@ public class CPrompt implements ICDoc {
         matchUI.getGameController().selectButtonCancel();
     }
 
-    public void setMessage(final String s0) {
-        String header = FControl.instance.getCurrentScreen().getDaytime() != null ? "[" + Localizer.getInstance().getMessage("lbl"+FControl.instance.getCurrentScreen().getDaytime()) + "]\n\n" : "";
-        header += s0;
+    public void setMessage(final String header) {
         view.getTarMessage().setText(FSkin.encodeSymbols(header, false));
         view.setCardView(null);
     }
diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputBase.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputBase.java
index d69b681c895..5a52d579371 100644
--- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputBase.java
+++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputBase.java
@@ -134,7 +134,18 @@ public abstract class InputBase implements java.io.Serializable, Input {
         final StringBuilder sb = new StringBuilder();
         Localizer localizer = Localizer.getInstance();
         sb.append(localizer.getMessage("lblPriority")).append(": ").append(ph.getPriorityPlayer()).append("\n");
-        sb.append(localizer.getMessage("lblTurn")).append(": ").append(ph.getTurn()).append(" (").append(ph.getPlayerTurn()).append(")\n");
+        sb.append(localizer.getMessage("lblTurn")).append(": ").append(ph.getTurn()).append(" (").append(ph.getPlayerTurn()).append(")");
+
+        if (!game.isNeitherDayNorNight()) {
+            sb.append("  [");
+
+            String dayLabel = game.isDay() ? "Day" : "Night";
+
+            sb.append(Localizer.getInstance().getMessage("lbl" + dayLabel));
+            sb.append("]");
+        }
+
+        sb.append("\n");
         sb.append(localizer.getMessage("lblPhase")).append(": ").append(ph.getPhase().nameForUi).append("\n");
         sb.append(localizer.getMessage("lblStack")).append(": ");
         if (!game.getStack().isEmpty()) {