diff --git a/xtt/exe/rt_xtt/src/rt_xtt_main.h b/xtt/exe/rt_xtt/src/rt_xtt_main.h
index 67a48b19f013355257074919e73b15b9e7253a3c..0e731514359c2dfa76d481b913df8538c14319c8 100644
--- a/xtt/exe/rt_xtt/src/rt_xtt_main.h
+++ b/xtt/exe/rt_xtt/src/rt_xtt_main.h
@@ -83,6 +83,7 @@ class Xtt {
     int		select_opplace;
     int		op_close_button;
     int		no_advanceduser;
+    int		network_optimized;
 
     Xtt( int *argc, char **argv[], int *return_sts);
     virtual ~Xtt() {}
diff --git a/xtt/exe/rt_xtt/src/xtt_main.cpp b/xtt/exe/rt_xtt/src/xtt_main.cpp
index e8785a92b6df02c8874829fc051b8f5d3ca13f8a..260bc9a22767ba6b8e090cceb7758cc53a71413d 100644
--- a/xtt/exe/rt_xtt/src/xtt_main.cpp
+++ b/xtt/exe/rt_xtt/src/xtt_main.cpp
@@ -531,7 +531,9 @@ void Xtt::activate_help_proview()
 }
 
 Xtt::Xtt( int *argc, char **argv[], int *return_sts) :
-  root_item(0), input_open(0), command_open(0), india_ok_cb(0), queid(qcom_cNQid), quiet(0), attach_audio(0), select_opplace(0), op_close_button(0), no_advanceduser(0)
+  root_item(0), input_open(0), command_open(0), india_ok_cb(0), queid(qcom_cNQid), quiet(0), 
+  attach_audio(0), select_opplace(0), op_close_button(0), no_advanceduser(0), 
+  network_optimized(0)
 {
   pwr_tStatus	sts;
   int		i;
@@ -601,6 +603,9 @@ Xtt::Xtt( int *argc, char **argv[], int *return_sts) :
 	case 'd':
 	  no_advanceduser = 1;
 	  break;
+	case 'n':
+	  network_optimized = 1;
+	  break;
 	case 'l':
 	  if ( i + 1 >= *argc ||
 	       !((*argv)[i][j+1] == ' ' || (*argv)[i][j+1] != '	')) {
@@ -675,6 +680,9 @@ Xtt::Xtt( int *argc, char **argv[], int *return_sts) :
     }
   }
     
+  if ( network_optimized)
+    XttMethodToolbar::disable();
+
   if ( select_opplace) {
     // Check if there is only one single opplace
     pwr_tOName fullname;
diff --git a/xtt/lib/xtt/gtk/xtt_methodtoolbar_gtk.cpp b/xtt/lib/xtt/gtk/xtt_methodtoolbar_gtk.cpp
index 231306897ce1f2a7f073d3c4f02969fe50c2dec7..a28afc41667bac960f714edd4df9cc48360674d8 100644
--- a/xtt/lib/xtt/gtk/xtt_methodtoolbar_gtk.cpp
+++ b/xtt/lib/xtt/gtk/xtt_methodtoolbar_gtk.cpp
@@ -133,6 +133,9 @@ gboolean XttMethodToolbarGtk::set_sensitive_cb( void *data)
 
 void XttMethodToolbarGtk::set_current_sensitive()
 {
+  if ( m_disabled)
+    return;
+
   int		is_attr;
   pwr_sAttrRef	aref;
   xmenu_eItemType menu_type;
diff --git a/xtt/lib/xtt/src/xtt_methodtoolbar.cpp b/xtt/lib/xtt/src/xtt_methodtoolbar.cpp
index 0d5c87559834c49f58e1308a8fe9ea94f0ee58a5..773d1a7445f5bc07a9c9a282e5c8093785fb728e 100644
--- a/xtt/lib/xtt/src/xtt_methodtoolbar.cpp
+++ b/xtt/lib/xtt/src/xtt_methodtoolbar.cpp
@@ -40,6 +40,8 @@
 #include <stdlib.h>
 #include "xtt_methodtoolbar.h"
 
+int XttMethodToolbar::m_disabled = 0;
+
 xtt_sMethodButton XttMethodToolbar::m_data[XttMethodToolbar::m_size] =
   {{"Help", 		"$Object-Help",		"$Object-HelpFilter", 		"$pwr_exe/xtt_meth_help.png", 		"Help"},
    {"Note",		"$Object-Note",		"$Object-NoteFilter", 		"$pwr_exe/xtt_meth_note.png", 		"Note"},
diff --git a/xtt/lib/xtt/src/xtt_methodtoolbar.h b/xtt/lib/xtt/src/xtt_methodtoolbar.h
index 83c7ef50115085e19dfeb6c9a047fe92ee464881..0b246a09970fcdf0af79f13a2d96b6b4d3b6fbdd 100644
--- a/xtt/lib/xtt/src/xtt_methodtoolbar.h
+++ b/xtt/lib/xtt/src/xtt_methodtoolbar.h
@@ -74,6 +74,7 @@ class XttMethodToolbar {
  public:
   static const int m_size = 17;
   static xtt_sMethodButton m_data[m_size];
+  static int m_disabled;
   XNav *m_xnav;
   void *m_parent_ctx;
   unsigned int m_method_mask;
@@ -85,6 +86,8 @@ class XttMethodToolbar {
     get_select_cb(0) { strcpy( m_tooltip_suffix, tooltip_suffix); }
   virtual ~XttMethodToolbar() {}
   virtual void set_sensitive() {}
+
+  static void disable() { m_disabled = 1;}
 };
 
 #endif