diff --git a/Global_Indexer/ClassFilehandle.vb b/Global_Indexer/ClassFilehandle.vb
index 5bb1555..06006ce 100644
--- a/Global_Indexer/ClassFilehandle.vb
+++ b/Global_Indexer/ClassFilehandle.vb
@@ -29,11 +29,8 @@ Public Class ClassFilehandle
                     oResult = MessageBox.Show(oMessage, oTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly)
 
                     If oResult = MsgBoxResult.Yes Then
-                        If pHandletype.StartsWith("|FW") Then
-                            Return Save_EmailAndAttachmentsToDisk(pFilename, True)
-                        Else
-                            Return Save_EmailAndAttachmentsToDisk(pFilename)
-                        End If
+                        Dim oIsFolderWatch = pHandletype.StartsWith("|FW")
+                        Return Save_EmailAndAttachmentsToDisk(pFilename, oIsFolderWatch)
                     End If
                 End If
             End If