diff --git a/functionality/filesharing/filesharing_functionality.go b/functionality/filesharing/filesharing_functionality.go
index 1099abf..0dae38a 100644
--- a/functionality/filesharing/filesharing_functionality.go
+++ b/functionality/filesharing/filesharing_functionality.go
@@ -2,19 +2,21 @@ package filesharing
 
 import (
 	"crypto/rand"
-	"cwtch.im/cwtch/model"
-	"cwtch.im/cwtch/model/attr"
-	"cwtch.im/cwtch/peer"
-	"cwtch.im/cwtch/protocol/files"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"git.openprivacy.ca/openprivacy/log"
 	"io"
 	"math"
 	path "path/filepath"
 	"strconv"
+	"time"
+
+	"cwtch.im/cwtch/model"
+	"cwtch.im/cwtch/model/attr"
+	"cwtch.im/cwtch/peer"
+	"cwtch.im/cwtch/protocol/files"
+	"git.openprivacy.ca/openprivacy/log"
 )
 
 // Functionality groups some common UI triggered functions for contacts...
@@ -88,6 +90,9 @@ func (f *Functionality) ShareFile(filepath string, profile peer.CwtchPeer, handl
 	// manifest.FileName gets redacted in filesharing_subsystem (to remove the system-specific file hierarchy),
 	// but we need to *store* the full path because the sender also uses it to locate the file
 	lenDiff := len(filepath) - len(path.Base(filepath))
+
+	profile.SetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%s.ts", key), strconv.FormatInt(time.Now().Unix(), 10))
+	profile.SetScopedZonedAttribute(attr.ConversationScope, attr.FilesharingZone, fmt.Sprintf("%s.manifest", key), string(serializedManifest))
 	profile.SetScopedZonedAttribute(attr.ConversationScope, attr.FilesharingZone, fmt.Sprintf("%s.manifest.size", key), strconv.Itoa(int(math.Ceil(float64(len(serializedManifest)-lenDiff)/float64(files.DefaultChunkSize)))))
 
 	profile.ShareFile(key, string(serializedManifest))
diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go
index 9020186..da72524 100644
--- a/peer/cwtch_peer.go
+++ b/peer/cwtch_peer.go
@@ -1,7 +1,6 @@
 package peer
 
 import (
-	"cwtch.im/cwtch/model/constants"
 	"encoding/base32"
 	"encoding/base64"
 	"encoding/json"
@@ -13,6 +12,8 @@ import (
 	"sync"
 	"time"
 
+	"cwtch.im/cwtch/model/constants"
+
 	"cwtch.im/cwtch/event"
 	"cwtch.im/cwtch/model"
 	"cwtch.im/cwtch/model/attr"
@@ -879,6 +880,14 @@ func (cp *cwtchPeer) eventHandler() {
 						val, exists = cp.GetScopedZonedAttribute(attr.PublicScope, attr.ProfileZone, constants.Name)
 					}
 
+					if exists && zone == attr.FilesharingZone && strings.HasSuffix(zpath, ".manifest.size") {
+						fileKey := strings.TrimSuffix(zpath, ".manifest.size")
+						serializedManifest, exists2 := cp.GetScopedZonedAttribute(attr.ConversationScope, attr.FilesharingZone, fmt.Sprintf("%s.manifest", fileKey))
+						if exists2 {
+							cp.ShareFile(fileKey, serializedManifest)
+						}
+					}
+
 					resp := event.NewEvent(event.SendRetValMessageToPeer, map[event.Field]string{event.RemotePeer: onion, event.Exists: strconv.FormatBool(exists)})
 					resp.EventID = ev.EventID
 					if exists {
@@ -902,7 +911,7 @@ func (cp *cwtchPeer) eventHandler() {
 
 			manifestFilePath, exists := cp.GetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%v.manifest", fileKey))
 			if exists {
-				downloadFilePath, exists := cp.GetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fileKey)
+				downloadFilePath, exists := cp.GetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%v.path", fileKey))
 				if exists {
 					log.Debugf("downloading manifest to %v, file to %v", manifestFilePath, downloadFilePath)
 					var manifest files.Manifest
@@ -939,7 +948,7 @@ func (cp *cwtchPeer) eventHandler() {
 			}
 		case event.FileDownloaded:
 			fileKey := ev.Data[event.FileKey]
-			cp.SetAttribute(fmt.Sprintf("%s.complete", fileKey), "true")
+			cp.SetScopedZonedAttribute(attr.LocalScope, attr.FilesharingZone, fmt.Sprintf("%s.complete", fileKey), "true")
 		case event.NewRetValMessageFromPeer:
 			onion := ev.Data[event.RemotePeer]
 			scope := ev.Data[event.Scope]