diff --git a/PROMS/Sync/Sync/frmSync.Designer.cs b/PROMS/Sync/Sync/frmSync.Designer.cs
index b6249ccf..a744779d 100644
--- a/PROMS/Sync/Sync/frmSync.Designer.cs
+++ b/PROMS/Sync/Sync/frmSync.Designer.cs
@@ -52,6 +52,9 @@ namespace Sync
 			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
 			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.selectNoneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.mailboxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.buildToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -65,9 +68,8 @@ namespace Sync
 			this.restoreAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.restoreReadOnlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.listToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.selectNoneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.compareSourceSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.compareMailboxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.panel1.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgv)).BeginInit();
 			this.cms.SuspendLayout();
@@ -230,21 +232,23 @@ namespace Sync
 			// 
 			this.cms.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.compareToolStripMenuItem,
+            this.compareSourceSafeToolStripMenuItem,
+            this.compareMailboxToolStripMenuItem,
             this.restoreToolStripMenuItem});
 			this.cms.Name = "cms";
-			this.cms.Size = new System.Drawing.Size(124, 48);
+			this.cms.Size = new System.Drawing.Size(188, 114);
 			// 
 			// compareToolStripMenuItem
 			// 
 			this.compareToolStripMenuItem.Name = "compareToolStripMenuItem";
-			this.compareToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+			this.compareToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
 			this.compareToolStripMenuItem.Text = "Compare";
 			this.compareToolStripMenuItem.Click += new System.EventHandler(this.compareToolStripMenuItem_Click);
 			// 
 			// restoreToolStripMenuItem
 			// 
 			this.restoreToolStripMenuItem.Name = "restoreToolStripMenuItem";
-			this.restoreToolStripMenuItem.Size = new System.Drawing.Size(123, 22);
+			this.restoreToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
 			this.restoreToolStripMenuItem.Text = "Restore";
 			this.restoreToolStripMenuItem.Click += new System.EventHandler(this.restoreToolStripMenuItem_Click);
 			// 
@@ -286,6 +290,29 @@ namespace Sync
 			this.exitToolStripMenuItem.Text = "E&xit";
 			this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
 			// 
+			// editToolStripMenuItem
+			// 
+			this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.selectAllToolStripMenuItem,
+            this.selectNoneToolStripMenuItem});
+			this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+			this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
+			this.editToolStripMenuItem.Text = "&Edit";
+			// 
+			// selectAllToolStripMenuItem
+			// 
+			this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
+			this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
+			this.selectAllToolStripMenuItem.Text = "Select All";
+			this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
+			// 
+			// selectNoneToolStripMenuItem
+			// 
+			this.selectNoneToolStripMenuItem.Name = "selectNoneToolStripMenuItem";
+			this.selectNoneToolStripMenuItem.Size = new System.Drawing.Size(137, 22);
+			this.selectNoneToolStripMenuItem.Text = "Select None";
+			this.selectNoneToolStripMenuItem.Click += new System.EventHandler(this.selectNoneToolStripMenuItem_Click);
+			// 
 			// mailboxToolStripMenuItem
 			// 
 			this.mailboxToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -386,28 +413,19 @@ namespace Sync
 			this.listToClipboardToolStripMenuItem.Text = "List toClipboard";
 			this.listToClipboardToolStripMenuItem.Click += new System.EventHandler(this.listToClipboardToolStripMenuItem_Click);
 			// 
-			// editToolStripMenuItem
+			// compareSourceSafeToolStripMenuItem
 			// 
-			this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.selectAllToolStripMenuItem,
-            this.selectNoneToolStripMenuItem});
-			this.editToolStripMenuItem.Name = "editToolStripMenuItem";
-			this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
-			this.editToolStripMenuItem.Text = "&Edit";
+			this.compareSourceSafeToolStripMenuItem.Name = "compareSourceSafeToolStripMenuItem";
+			this.compareSourceSafeToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.compareSourceSafeToolStripMenuItem.Text = "Compare Source Safe";
+			this.compareSourceSafeToolStripMenuItem.Click += new System.EventHandler(this.compareSourceSafeToolStripMenuItem_Click);
 			// 
-			// selectAllToolStripMenuItem
+			// compareMailboxToolStripMenuItem
 			// 
-			this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
-			this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-			this.selectAllToolStripMenuItem.Text = "Select All";
-			this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
-			// 
-			// selectNoneToolStripMenuItem
-			// 
-			this.selectNoneToolStripMenuItem.Name = "selectNoneToolStripMenuItem";
-			this.selectNoneToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
-			this.selectNoneToolStripMenuItem.Text = "Select None";
-			this.selectNoneToolStripMenuItem.Click += new System.EventHandler(this.selectNoneToolStripMenuItem_Click);
+			this.compareMailboxToolStripMenuItem.Name = "compareMailboxToolStripMenuItem";
+			this.compareMailboxToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
+			this.compareMailboxToolStripMenuItem.Text = "Compare Mailbox";
+			this.compareMailboxToolStripMenuItem.Click += new System.EventHandler(this.compareMailboxToolStripMenuItem_Click);
 			// 
 			// frmSync
 			// 
@@ -476,6 +494,8 @@ namespace Sync
 		private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem selectNoneToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem compareSourceSafeToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem compareMailboxToolStripMenuItem;
 	}
 }
 
diff --git a/PROMS/Sync/Sync/frmSync.cs b/PROMS/Sync/Sync/frmSync.cs
index 1a390228..dcb91903 100644
--- a/PROMS/Sync/Sync/frmSync.cs
+++ b/PROMS/Sync/Sync/frmSync.cs
@@ -291,22 +291,22 @@ namespace Sync
 			List<FileCompare> fcList = SelectedList;
 			foreach (FileCompare fc in fcList)
 			{
-				Console.WriteLine("Compare {0} and {1}", fc.FileName, fc.SSFileName);
-                string progname = string.Empty;
-                if (System.IO.File.Exists(@"C:\Program Files\IDM Computer Solutions\UltraCompare\UC.exe"))
-                {
-                    progname = @"C:\Program Files\IDM Computer Solutions\UltraCompare\UC.exe";
-                }
-                if (System.IO.File.Exists(@"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe"))
-                {
-                    progname = @"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe";
-                }
-//				string cmd = string.Format("\"{0}\" -t \"{1}\" \"{2}\"", progname, fc.FileName, fc.SSFileName);
-                System.Diagnostics.ProcessStartInfo psi = new System.Diagnostics.ProcessStartInfo(progname,
-					string.Format(@" -t ""{0}"" ""{1}""", fc.FileName, fc.SSFileName));
-				System.Diagnostics.Process prc = System.Diagnostics.Process.Start(psi);
+				CompareOneFile(fc.FileName, fc.SSFileName);
 			}
 		}
+		private static void CompareOneFile(string fileDev, string fileSS)
+		{
+			Console.WriteLine("Compare {0} and {1}", fileDev, fileSS);
+			string progname = string.Empty;
+			if (System.IO.File.Exists(@"C:\Program Files\IDM Computer Solutions\UltraCompare\UC.exe"))
+				progname = @"C:\Program Files\IDM Computer Solutions\UltraCompare\UC.exe";
+			if (System.IO.File.Exists(@"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe"))
+				progname = @"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe";
+			//				string cmd = string.Format("\"{0}\" -t \"{1}\" \"{2}\"", progname, fc.FileName, fc.SSFileName);
+			System.Diagnostics.ProcessStartInfo psi =
+				new System.Diagnostics.ProcessStartInfo(progname, string.Format(@" -t ""{0}"" ""{1}""", fileDev, fileSS));
+			System.Diagnostics.Process prc = System.Diagnostics.Process.Start(psi);
+		}
 		private void restoreToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			dgv.EndEdit();
@@ -505,5 +505,31 @@ namespace Sync
 			foreach (FileCompare fc in _CheckedOut) fc.ToProcess = false;
 			dgv.Refresh();
 		}
+
+		private void compareSourceSafeToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			// Compare SS version with SS version from Mailbox
+			dgv.EndEdit();
+			// This should launch UltraCompare with the two files
+			// Which Item am I on
+			List<FileCompare> fcList = SelectedList;
+			foreach (FileCompare fc in fcList)
+			{
+				CompareOneFile(fc.SSFileName, fc.SSFileName.Replace(tbSourceSafe.Text, tbSSMailBox.Text));
+			}
+		}
+
+		private void compareMailboxToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			// Compare MailBox version with Mailbox Source Safe version
+			dgv.EndEdit();
+			// This should launch UltraCompare with the two files
+			// Which Item am I on
+			List<FileCompare> fcList = SelectedList;
+			foreach (FileCompare fc in fcList)
+			{
+				CompareOneFile(fc.FileName, fc.FileName.Replace(tbDevelopment.Text, tbSSMailBox.Text));
+			}
+		}
 	}
 }
\ No newline at end of file