diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 869e12ee..e3f95046 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1557,3 +1557,7 @@ Holger Brunn <holger.brunn@stud.uni-karlsruhe.de>
 Christian Vogt <c.v@nexgo.de>
  for suggesting to take deleted recordings into account when displaying the
  amount of free disk space
+
+Christof Steininger <christof.steininger@t-online.de>
+ for fixing a possible crash when displaying the "Low disk space!" message from
+ a background thread
diff --git a/HISTORY b/HISTORY
index 79b8e848..e72ee5b6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3984,3 +3984,5 @@ Video Disk Recorder Revision History
 - Fixed handling the DELETEDLIFETIME when removing deleted recordings. Now
   a deleted recording is retained at least DELETEDLIFETIME seconds before
   actually removing it (unless a new recording requires the disk space).
+- Fixed a possible crash when displaying the "Low disk space!" message from
+  a background thread (thanks to Christof Steininger).
diff --git a/recording.c b/recording.c
index 73625498..61098095 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.126 2005/12/18 12:06:36 kls Exp $
+ * $Id: recording.c 1.127 2005/12/18 12:37:10 kls Exp $
  */
 
 #include "recording.h"
@@ -144,7 +144,7 @@ void AssertFreeDiskSpace(int Priority)
            }
         // Unable to free disk space, but there's nothing we can do about that...
         isyslog("...no old recording found, giving up");
-        Interface->Confirm(tr("Low disk space!"), 30);
+        Skins.QueueMessage(mtWarning, tr("Low disk space!"), 5, -1);
         }
      LastFreeDiskCheck = time(NULL);
      }