diff --git a/app/src/main/java/com/gmail/afonsotrepa/pocketgopher/Bookmark.java b/app/src/main/java/com/gmail/afonsotrepa/pocketgopher/Bookmark.java
index 4548f9c..4ab80f2 100644
--- a/app/src/main/java/com/gmail/afonsotrepa/pocketgopher/Bookmark.java
+++ b/app/src/main/java/com/gmail/afonsotrepa/pocketgopher/Bookmark.java
@@ -17,6 +17,8 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -85,8 +87,8 @@ void add(Context context)
             );
 
             outputStream.write((
-                    this.name + "\t" +
-                            this.url + "\t" +
+                            this.name + "\t" +
+                            URLEncoder.encode(this.url, "UTF-8") + "\t" +
                             this.id.toString() + "\n"
             ).getBytes());
             outputStream.close();
@@ -121,7 +123,7 @@ static List<Bookmark> read(Context context)
                     //parse the bookmark
                     Bookmark bookmark = new Bookmark(
                             bsplit[0], //name
-                            bsplit[1], //url
+                            URLDecoder.decode(bsplit[1], "UTF-8"), //url
                             Integer.parseInt(bsplit[2]) //id
                     );