diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc
index a0d67fea8..99ca19595 100644
--- a/libretroshare/src/ft/ftserver.cc
+++ b/libretroshare/src/ft/ftserver.cc
@@ -486,9 +486,23 @@ void ftServer::removeVirtualPeer(const TurtleFileHash& hash,const TurtleVirtualP
 
 bool ftServer::handleTunnelRequest(const RsFileHash& hash,const RsPeerId& peer_id)
 {
-	FileInfo info ;
-	bool res = FileDetails(hash, RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_LOCAL | RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_SPEC_ONLY | RS_FILE_HINTS_DOWNLOAD, info);
+    FileInfo info ;
+    bool res = FileDetails(hash, RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_LOCAL | RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_SPEC_ONLY, info);
 
+    if( (!res) && FileDetails(hash,RS_FILE_HINTS_DOWNLOAD,info))
+    {
+        // This file is currently being downloaded. Let's look if we already have a chunk or not. If not, no need to
+        // share the file!
+
+        FileChunksInfo info2 ;
+        if(rsFiles->FileDownloadChunksDetails(hash, info2))
+            for(uint32_t i=0;i<info2.chunks.size();++i)
+                if(info2.chunks[i] == FileChunksInfo::CHUNK_DONE)
+                {
+                    res = true ;
+                    break ;
+                }
+    }
 #ifdef SERVER_DEBUG
 	std::cerr << "ftServer: performing local hash search for hash " << hash << std::endl;
 
diff --git a/libretroshare/src/turtle/p3turtle.cc b/libretroshare/src/turtle/p3turtle.cc
index 5a7b71d32..a195e30e1 100644
--- a/libretroshare/src/turtle/p3turtle.cc
+++ b/libretroshare/src/turtle/p3turtle.cc
@@ -79,24 +79,24 @@ void TS_dumpState() ;
 //    - The total number of TR per second emmited from self will be MAX_TUNNEL_REQS_PER_SECOND / TIME_BETWEEN_TUNNEL_MANAGEMENT_CALLS = 0.5
 //    - I updated forward probabilities to higher values, and min them to 1/nb_connected_friends to prevent blocking tunnels.
 //
-static const time_t TUNNEL_REQUESTS_LIFE_TIME 	         = 120 ;		/// life time for tunnel requests in the cache.
+static const time_t TUNNEL_REQUESTS_LIFE_TIME 	         = 240 ;		/// life time for tunnel requests in the cache.
 static const time_t SEARCH_REQUESTS_LIFE_TIME 	         = 240 ;		/// life time for search requests in the cache
 static const time_t REGULAR_TUNNEL_DIGGING_TIME          = 300 ;		/// maximum interval between two tunnel digging campaigns.
 static const time_t MAXIMUM_TUNNEL_IDLE_TIME 	         =  60 ;		/// maximum life time of an unused tunnel.
 static const time_t EMPTY_TUNNELS_DIGGING_TIME 	         =  50 ;		/// look into tunnels regularly every 50 sec.
 static const time_t TUNNEL_SPEED_ESTIMATE_LAPSE	         =   5 ;		/// estimate tunnel speed every 5 seconds
 static const time_t TUNNEL_CLEANING_LAPS_TIME  	         =  10 ;		/// clean tunnels every 10 secs
-static const time_t TIME_BETWEEN_TUNNEL_MANAGEMENT_CALLS	=   2 ;     /// Tunnel management calls every 2 secs. 
+static const time_t TIME_BETWEEN_TUNNEL_MANAGEMENT_CALLS =   2 ;                /// Tunnel management calls every 2 secs.
 static const uint32_t MAX_TUNNEL_REQS_PER_SECOND         =   1 ;		/// maximum number of tunnel requests issued per second. Was 0.5 before
 static const uint32_t MAX_ALLOWED_SR_IN_CACHE            = 120 ;		/// maximum number of search requests allowed in cache. That makes 2 per sec.
 
 static const float depth_peer_probability[7] = { 1.0f,0.99f,0.9f,0.7f,0.6f,0.5,0.4f } ;
 
-static const int TUNNEL_REQUEST_PACKET_SIZE 	       = 50 ;
-static const int MAX_TR_FORWARD_PER_SEC 		       = 20 ;
-static const int MAX_TR_FORWARD_PER_SEC_UPPER_LIMIT = 30 ;
-static const int MAX_TR_FORWARD_PER_SEC_LOWER_LIMIT = 10 ;
-static const int DISTANCE_SQUEEZING_POWER 	       =  8 ;
+static const int TUNNEL_REQUEST_PACKET_SIZE             = 50 ;
+static const int MAX_TR_FORWARD_PER_SEC                 = 20 ;
+static const int MAX_TR_FORWARD_PER_SEC_UPPER_LIMIT     = 30 ;
+static const int MAX_TR_FORWARD_PER_SEC_LOWER_LIMIT     = 10 ;
+static const int DISTANCE_SQUEEZING_POWER               =  8 ;
 
 p3turtle::p3turtle(p3ServiceControl *sc,p3LinkMgr *lm)
 	:p3Service(), p3Config(), mServiceControl(sc), mLinkMgr(lm), mTurtleMtx("p3turtle")