diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.cpp b/retroshare-gui/src/gui/feeds/SubFileItem.cpp
index ac4745ef8..209bffa28 100644
--- a/retroshare-gui/src/gui/feeds/SubFileItem.cpp
+++ b/retroshare-gui/src/gui/feeds/SubFileItem.cpp
@@ -130,7 +130,9 @@ void SubFileItem::Setup()
 	}
   }
 
-  deleteButton->setVisible(mFlag & SFI_FLAG_DELETE);
+  deleteButton->setVisible(mFlag & SFI_FLAG_ALLOW_DELETE);
+  downloadButton->setVisible(mMode < SFI_STATE_LOCAL);
+  cancelButton->setVisible(mMode < SFI_STATE_LOCAL);
 
   smaller();
   updateItemStatic();
diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.h b/retroshare-gui/src/gui/feeds/SubFileItem.h
index fac68b792..330725a4c 100644
--- a/retroshare-gui/src/gui/feeds/SubFileItem.h
+++ b/retroshare-gui/src/gui/feeds/SubFileItem.h
@@ -40,8 +40,9 @@ const uint32_t SFI_STATE_UPLOAD		= 0x0006;
 const uint32_t SFI_TYPE_CHANNEL		= 0x0010;
 const uint32_t SFI_TYPE_ATTACH		= 0x0020;
 
-const uint32_t SFI_FLAG_CREATE		= 0x1000;
-const uint32_t SFI_FLAG_DELETE		= 0x2000;
+const uint32_t SFI_FLAG_CREATE		        = 0x1000;
+const uint32_t SFI_FLAG_ALLOW_DELETE		= 0x2000;
+const uint32_t SFI_FLAG_NO_DOWNLOAD 		= 0x4000;
 
 
 //! This create a gui widget that allows users to access files shared by user
diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
index bd17927a9..ed8fb6f07 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
@@ -351,7 +351,7 @@ void CreateGxsChannelMsg::addAttachment(const RsFileHash &hash, const std::strin
 
 	/* add widget in for new destination */
 
-	uint32_t flags = SFI_TYPE_CHANNEL | SFI_FLAG_DELETE;
+	uint32_t flags = SFI_TYPE_CHANNEL | SFI_FLAG_ALLOW_DELETE ;
 	if (local)
 	{
 		flags |= SFI_STATE_LOCAL;