diff --git a/checkin_notes b/checkin_notes
index cee1649093..3402edf429 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4032,10 +4032,18 @@ Rom    May 15 2008
         configure.ac
         version.h
 
-Rom    May 14 2008 (HEAD)
+Rom    May 15 2008 (HEAD)
     - Bump version to 6.3.2
 
     /
         configure.ac
         version.h
 
+Rom    May 15 2008
+    - SCR: BOINC's screensaver module in preview mode only displays
+        the BOINC icon, since the preview window is only 300x200 or
+        so. We shouldn't launch the data management thread when
+        launched in preview mode.
+        
+    clientscr/
+        screensaver_win.cpp
diff --git a/clientscr/screensaver_win.cpp b/clientscr/screensaver_win.cpp
index 469fb40dba..cf0e92a962 100644
--- a/clientscr/screensaver_win.cpp
+++ b/clientscr/screensaver_win.cpp
@@ -323,6 +323,14 @@ INT CScreensaver::Run() {
         rpc->close();
         break;
     case sm_preview:
+        // In Windows, preview mode is for the mini-view of the screensaver.
+        //   For BOINC we just display the icon, so there is no need to
+        //   startup the data management thread which in turn will
+        //   launch a graphics application.
+        if (FAILED(hr = DoSaver())) {
+            DisplayErrorMsg(hr);
+        }
+        break;
     case sm_full:
         // Create the data management thread to talk with the daemon
         if (!CreateDataManagementThread()) {
@@ -344,7 +352,6 @@ INT CScreensaver::Run() {
             rpc = NULL;
         }
         break;
-        
     case sm_passwordchange:
         ChangePassword();
         break;