diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 59061068..79bb9444 100644
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -30,6 +30,7 @@ import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
 import org.asamk.signal.storage.threads.ThreadInfo;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
+import org.asamk.signal.JsonAttachment;
 import org.signal.libsignal.metadata.InvalidMetadataMessageException;
 import org.signal.libsignal.metadata.InvalidMetadataVersionException;
 import org.signal.libsignal.metadata.ProtocolDuplicateMessageException;
@@ -144,7 +145,7 @@ public class Manager implements Signal {
         this.dataPath = this.settingsPath + "/data";
         this.attachmentsPath = this.settingsPath + "/attachments";
         this.avatarsPath = this.settingsPath + "/avatars";
-
+        JsonAttachment.setAttachmentStoragePath(this.attachmentsPath);
     }
 
     public String getUsername() {
@@ -1460,6 +1461,10 @@ public class Manager implements Signal {
         return new File(attachmentsPath, attachmentId + "");
     }
 
+    public String getAttachmentFilePath(long attachmentId) {
+    	return attachmentsPath + File.separator + attachmentId;
+    }
+    
     private File retrieveAttachment(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException {
         IOUtils.createPrivateDirectories(attachmentsPath);
         return retrieveAttachment(pointer, getAttachmentFile(pointer.getId()), true);