diff --git a/images/imap-download/run.sh b/images/imap-download/run.sh
index 49be98a..22872cc 100755
--- a/images/imap-download/run.sh
+++ b/images/imap-download/run.sh
@@ -98,13 +98,13 @@ do_attachments() {
 			# Unpack the attachments
 			munpack -C "${temp_dir}" "${filename}";
 			# Delete the original email file and any description files
-			rm "${temp_dir}/${filename}";
+			rm "${temp_dir}/$(basename "${filename}")";
 			find "${temp_dir}" -iname '*.desc' -delete;
 			
 			# Move the attachment files to the output directory
 			while read -r attachment; do
 				log_msg "Extracted attachment ${attachment}";
-				chmod 0775 "${temp_dir}/${attachment}";
+				chmod 0775 "${attachment}";
 				move_attachment "${attachment}";
 			done < <(find "${temp_dir}" -type f);
 		done < <(find "${dir_newmail}" -type f);