diff --git a/app/lib/methods/sendFileMessage.js b/app/lib/methods/sendFileMessage.js
index b5a85c4c..041b1f40 100644
--- a/app/lib/methods/sendFileMessage.js
+++ b/app/lib/methods/sendFileMessage.js
@@ -62,7 +62,7 @@ export function sendFileMessage(rid, fileInfo, tmid, server, user) {
 			formData.append('file', {
 				uri: fileInfo.path,
 				type: fileInfo.type,
-				name: fileInfo.name || 'fileMessage'
+				name: encodeURI(fileInfo.name) || 'fileMessage'
 			});
 
 			if (fileInfo.description) {
diff --git a/app/views/AttachmentView.js b/app/views/AttachmentView.js
index c94a8e84..9f23833e 100644
--- a/app/views/AttachmentView.js
+++ b/app/views/AttachmentView.js
@@ -35,7 +35,7 @@ class AttachmentView extends React.Component {
 		const handleSave = navigation.getParam('handleSave', () => {});
 		const { title } = attachment;
 		const options = {
-			title,
+			title: decodeURI(title),
 			...themedHeader(theme),
 			headerRight: <SaveButton testID='save-image' onPress={handleSave} />
 		};