diff --git a/Pachyderm/Model/Attachment.swift b/Pachyderm/Model/Attachment.swift
index b9663bc6..32bcee85 100644
--- a/Pachyderm/Model/Attachment.swift
+++ b/Pachyderm/Model/Attachment.swift
@@ -29,15 +29,15 @@ public class Attachment: Decodable {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         self.id = try container.decode(String.self, forKey: .id)
         self.kind = try container.decode(Kind.self, forKey: .kind)
-        self.url = URL(lenient: try container.decode(String.self, forKey: .url))!
+        self.url = URL(string: try container.decode(String.self, forKey: .url))!
+        self.previewURL = URL(string: try container.decode(String.self, forKey: .previewURL))!
         if let remote = try? container.decode(String.self, forKey: .remoteURL) {
-            self.remoteURL = URL(lenient: remote.replacingOccurrences(of: " ", with: "%20"))
+            self.remoteURL = URL(string: remote)!
         } else {
             self.remoteURL = nil
         }
-        self.previewURL = URL(lenient: try container.decode(String.self, forKey: .previewURL).replacingOccurrences(of: " ", with: "%20"))!
         if let text = try? container.decode(String.self, forKey: .textURL) {
-            self.textURL = URL(lenient: text.replacingOccurrences(of: " ", with: "%20"))
+            self.textURL = URL(string: text)!
         } else {
             self.textURL = nil
         }
@@ -113,14 +113,3 @@ extension Attachment {
         }
     }
 }
-
-fileprivate extension URL {
-    private static let allowedChars = CharacterSet.urlHostAllowed.union(.urlPathAllowed).union(.urlQueryAllowed)
-    
-    init?(lenient string: String) {
-        guard let escaped = string.addingPercentEncoding(withAllowedCharacters: URL.allowedChars) else {
-            return nil
-        }
-        self.init(string: escaped)
-    }
-}