diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index 6a0feaf2b..5b3b49908 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -52,7 +52,7 @@ TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags)
     QObject::connect(ui._queueSize_SB,SIGNAL(valueChanged(int)),this,SLOT(updateQueueSize(int))) ;
     QObject::connect(ui._max_up_SB,SIGNAL(valueChanged(int)),this,SLOT(updateMaxUploadSlots(int))) ;
     QObject::connect(ui._defaultStrategy_CB,SIGNAL(activated(int)),this,SLOT(updateDefaultStrategy(int))) ;
-    QObject::connect(ui._e2e_encryption_CB,SIGNAL(activated(int)),this,SLOT(updateEncryptionPolicy(int))) ;
+    //QObject::connect(ui._e2e_encryption_CB,SIGNAL(activated(int)),this,SLOT(updateEncryptionPolicy(int))) ;
     QObject::connect(ui._diskSpaceLimit_SB,SIGNAL(valueChanged(int)),this,SLOT(updateDiskSizeLimit(int))) ;
     QObject::connect(ui._max_tr_up_per_sec_SB, SIGNAL( valueChanged( int ) ), this, SLOT( updateMaxTRUpRate(int) ) );
 	QObject::connect(ui._filePermDirectDL_CB,SIGNAL(activated(int)),this,SLOT(updateFilePermDirectDL(int)));
@@ -112,6 +112,7 @@ void TransferPage::updateMaxUploadSlots(int b)
     rsFiles->setMaxUploadSlotsPerFriend(b) ;
 }
 
+#ifdef TO_REMOVE
 void TransferPage::updateEncryptionPolicy(int b)
 {
     switch(b)
@@ -123,6 +124,7 @@ void TransferPage::updateEncryptionPolicy(int b)
         break ;
     }
 }
+#endif
 
 void TransferPage::updateFilePermDirectDL(int i)
 {
@@ -160,11 +162,13 @@ void TransferPage::load()
     case FileChunksInfo::CHUNK_STRATEGY_RANDOM: whileBlocking(ui._defaultStrategy_CB)->setCurrentIndex(2) ; break ;
     }
 
+#ifdef TO_REMOVE
     switch(rsFiles->defaultEncryptionPolicy())
     {
     case RS_FILE_CTRL_ENCRYPTION_POLICY_PERMISSIVE: whileBlocking(ui._e2e_encryption_CB)->setCurrentIndex(0) ; break ;
     case RS_FILE_CTRL_ENCRYPTION_POLICY_STRICT    : whileBlocking(ui._e2e_encryption_CB)->setCurrentIndex(1) ; break ;
     }
+#endif
 
     whileBlocking(ui._diskSpaceLimit_SB)->setValue(rsFiles->freeDiskSpaceLimit()) ;
     whileBlocking(ui._max_tr_up_per_sec_SB)->setValue(rsTurtle->getMaxTRForwardRate()) ;
diff --git a/retroshare-gui/src/gui/settings/TransferPage.h b/retroshare-gui/src/gui/settings/TransferPage.h
index a2a0a1061..077d5a6ec 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.h
+++ b/retroshare-gui/src/gui/settings/TransferPage.h
@@ -47,7 +47,6 @@ class TransferPage: public ConfigPage
 		void updateDefaultStrategy(int) ;
 		void updateDiskSizeLimit(int) ;
 		void updateMaxTRUpRate(int);
-		void updateEncryptionPolicy(int);
 		void updateMaxUploadSlots(int);
 		void updateFilePermDirectDL(int);
 		void updateIgnoreLists();
diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index b6d8cd7ff..e77ee1742 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -400,13 +400,6 @@ p, li { white-space: pre-wrap; }
                 </property>
                </widget>
               </item>
-              <item>
-               <widget class="QLabel" name="_e2e_encryption_Label">
-                <property name="text">
-                 <string>End-to-end encryption:</string>
-                </property>
-               </widget>
-              </item>
               <item>
                <widget class="QLabel" name="_filePermDirectDL_Label">
                 <property name="text">
@@ -503,23 +496,6 @@ p, li { white-space: pre-wrap; }
                 </property>
                </widget>
               </item>
-              <item>
-               <widget class="RSComboBox" name="_e2e_encryption_CB">
-                <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anonymous tunnels can be end-o-end encrypted. In order to maintain backward compatibility, this can be made optional (choosing &amp;quot;Accepted&amp;quot;), but in the end, all Retroshare nodes will be switched to &amp;quot;Enforced&amp;quot;, meaning that all anonymous transfers will be end-to-end encrypted. With &amp;quot;Accepted&amp;quot;, it is likely that you will transfer using twice as many tunnels, since there is no way to know that an encrypted and a clear tunnel actually transfer from the same source.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                </property>
-                <item>
-                 <property name="text">
-                  <string>Accepted</string>
-                 </property>
-                </item>
-                <item>
-                 <property name="text">
-                  <string>Enforced</string>
-                 </property>
-                </item>
-               </widget>
-              </item>
               <item>
                <widget class="RSComboBox" name="_filePermDirectDL_CB">
                 <property name="toolTip">