diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
index ffbf2ce3..06c64315 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
@@ -47,7 +47,7 @@ public class MusicUtil {
     public static Intent createShareSongFileIntent(final Context context, int songId) {
         return new Intent()
                 .setAction(Intent.ACTION_SEND)
-                .putExtra(Intent.EXTRA_STREAM, Uri.parse(SongFilePathLoader.getSongFilePath(context, songId)))
+                .putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + SongFilePathLoader.getSongFilePath(context, songId)))
                 .setType("audio/*");
     }
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java
index d88978e3..2a4d15b4 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtils.java
@@ -201,7 +201,7 @@ public final class PreferenceUtils {
 
     public final String getArtistAlbumSortOrder() {
         return mPreferences.getString(ARTIST_ALBUM_SORT_ORDER,
-                SortOrder.ArtistAlbumSortOrder.ALBUM_YEAR);
+                SortOrder.ArtistAlbumSortOrder.ALBUM_YEAR_ASC);
     }
 
 //    public void setAlbumSortOrder(final String value) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/SortOrder.java b/app/src/main/java/com/kabouzeid/gramophone/util/SortOrder.java
index 4ce904a6..9ccc7aa2 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/SortOrder.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/SortOrder.java
@@ -151,6 +151,10 @@ public final class SortOrder {
         /* Artist album sort order year */
         String ALBUM_YEAR = MediaStore.Audio.Artists.Albums.FIRST_YEAR
                 + " DESC";
+
+        /* Artist album sort order year */
+        String ALBUM_YEAR_ASC = MediaStore.Audio.Artists.Albums.FIRST_YEAR
+                + " ASC";
     }
 
 }
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 0a09a142..9645cda4 100644
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -40,7 +40,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <com.kabouzeid.gramophone.views.DynamicEditText
+                    <EditText
                         android:id="@+id/album_title"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <com.kabouzeid.gramophone.views.DynamicEditText
+                    <EditText
                         android:id="@+id/album_artist"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -88,7 +88,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <com.kabouzeid.gramophone.views.DynamicEditText
+                    <EditText
                         android:id="@+id/genre"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -107,7 +107,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <com.kabouzeid.gramophone.views.DynamicEditText
+                    <EditText
                         android:id="@+id/year"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index f65064d3..82c1d9c2 100644
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -40,7 +40,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <com.kabouzeid.gramophone.views.DynamicEditText
+                    <EditText
                         android:id="@+id/title1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <com.kabouzeid.gramophone.views.DynamicEditText
+                    <EditText
                         android:id="@+id/title2"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -88,7 +88,7 @@
                     android:layout_height="wrap_content"
                     >
 
-                    <com.kabouzeid.gramophone.views.DynamicEditText
+                    <EditText
                         android:id="@+id/artist"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -108,7 +108,7 @@
                     android:layout_height="wrap_content"
                     >
 
-                    <com.kabouzeid.gramophone.views.DynamicEditText
+                    <EditText
                         android:id="@+id/genre"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -128,7 +128,7 @@
                     android:layout_height="wrap_content"
                     >
 
-                    <com.kabouzeid.gramophone.views.DynamicEditText
+                    <EditText
                         android:id="@+id/year"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -149,7 +149,7 @@
                     android:layout_height="wrap_content"
                     >
 
-                    <com.kabouzeid.gramophone.views.DynamicEditText
+                    <EditText
                         android:id="@+id/track_number"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"