diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index c49398f4..c4cc92fb 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -3245,8 +3245,12 @@ namespace VEPROMS
 			}
 			if (ctrlAnnotationDetails.Enabled && epAnnotations.Enabled)
 			{
-			ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem);
-			AnnotationPanelView();
+				ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem);
+				AnnotationPanelView();
+			}
+			else if(_CurrentItem!=null) // B2017-127, B2017-131 Send message when a MSWord section is opened.
+			{
+				ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); // set the CurrentItem (send Message) when the MSWord section is opened.
 			}
 			btnPrint.Enabled = (_CurrentItem != null);
 		}
diff --git a/PROMS/Volian.Controls.Library/AnnotationDetails.cs b/PROMS/Volian.Controls.Library/AnnotationDetails.cs
index 34aa8dcb..b6462c80 100644
--- a/PROMS/Volian.Controls.Library/AnnotationDetails.cs
+++ b/PROMS/Volian.Controls.Library/AnnotationDetails.cs
@@ -95,7 +95,9 @@ namespace Volian.Controls.Library
 						_CurrentItem = value;
 						SetupCurrentItemValues();
 						SetupConfigEdit();
-						if (ExeType > 0) SendPromsAnnotationData();
+						// B2017-126 Only turn-on NamedPipe if Command Line parameter /NamedPipe is used.  
+						// This eliminates waiting for the Pipe if the command line parameter is not used.
+						if (ExeType > 0 && Volian.Base.Library.VlnSettings.GetCommandFlag("NamedPipe")) SendPromsAnnotationData();
 					}
 				}
 				private int _FromType;