diff --git a/ChangeLog b/ChangeLog
index 5df17c0cb..92304cf43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,8 @@
 23. Enable song notifications n Linux builds without QtDBus.
 24. Speed-up MPD response parsing, by only converting strings to UTF-8 when
     required.
+25. In Albums view, always show album name as main text and artist as sub-text
+    regardless of chosen sort.
 
 1.3.2
 -----
diff --git a/models/albumsmodel.cpp b/models/albumsmodel.cpp
index fd846f947..e3dc74145 100644
--- a/models/albumsmodel.cpp
+++ b/models/albumsmodel.cpp
@@ -239,7 +239,7 @@ QVariant AlbumsModel::data(const QModelIndex &index, int role) const
         case Qt::ToolTipRole: {
             quint32 year=al->songs.count() ? al->songs.at(0)->year : 0;
             return 0==al->songs.count()
-                ? al->name
+                ? QString()
                 : (year>0 ? QString("%1\n%2 (%3)\n").arg(al->artist).arg(al->album).arg(QString::number(year)) : QString("%1\n%2\n").arg(al->artist).arg(al->album))+
                     #ifdef ENABLE_KDE_SUPPORT
                     i18np("1 Track (%2)", "%1 Tracks (%2)", al->trackCount(), Song::formattedTime(al->totalTime(), true));
@@ -248,14 +248,13 @@ QVariant AlbumsModel::data(const QModelIndex &index, int role) const
                     #endif
         }
         case Qt::DisplayRole:
-            return al->name;
+            return al->album;
         case ItemView::Role_MainText:
-            return Sort_AlbumArtist==sortAlbums ? al->album : al->artist;
-        case ItemView::Role_ImageSize: {
+            return al->album;
+        case ItemView::Role_ImageSize:
             return iconSize();
-        }
         case ItemView::Role_SubText:
-            return Sort_AlbumArtist==sortAlbums ? al->artist : al->album;
+            return al->artist;
         case ItemView::Role_TitleText:
             return i18nc("Album by Artist", "%1 by %2", al->album, al->artist);
         case Qt::SizeHintRole:
@@ -523,9 +522,6 @@ void AlbumsModel::setAlbumSort(int s)
     if (s!=sortAlbums) {
         beginResetModel();
         sortAlbums=s;
-        foreach (AlbumItem *a, items) {
-            a->setName();
-        }
         endResetModel();
     }
 }
@@ -540,7 +536,6 @@ AlbumsModel::AlbumItem::AlbumItem(const QString &ar, const QString &al, quint16
     , numTracks(0)
     , time(0)
 {
-    setName();
 }
 
 AlbumsModel::AlbumItem::~AlbumItem()
@@ -551,15 +546,20 @@ AlbumsModel::AlbumItem::~AlbumItem()
 
 bool AlbumsModel::AlbumItem::operator<(const AlbumItem &o) const
 {
-    if (AlbumsModel::Sort_ArtistAlbumYear==sortAlbums) {
+    switch (sortAlbums) {
+    default:
+    case Sort_AlbumArtist:  {
+        int compare=album.localeAwareCompare(o.album);
+        return compare<0 || (0==compare && artist.localeAwareCompare(o.artist)<0);
+    }
+    case Sort_ArtistAlbum: {
         int compare=artist.localeAwareCompare(o.artist);
-        if (0==compare) {
-            return year<o.year || (year==o.year && album.localeAwareCompare(o.album)<0);
-        } else {
-            return compare<0;
-        }
-    } else {
-        return name.localeAwareCompare(o.name)<0;
+        return compare<0 || (0==compare && album.localeAwareCompare(o.album)<0);
+    }
+    case Sort_ArtistYearAlbum: {
+        int compare=artist.localeAwareCompare(o.artist);
+        return compare<0 || (0==compare && (year<o.year || (year==o.year && album.localeAwareCompare(o.album)<0)));
+    }
     }
 }
 
@@ -577,13 +577,6 @@ void AlbumsModel::AlbumItem::setSongs(MusicLibraryItemAlbum *ai)
     }
 }
 
-void AlbumsModel::AlbumItem::setName()
-{
-    name=AlbumsModel::Sort_AlbumArtist==sortAlbums
-            ? (album+QLatin1String(" - ")+artist)
-            : (artist+QLatin1String(" - ")+album);
-}
-
 quint32 AlbumsModel::AlbumItem::trackCount()
 {
     updateStats();
diff --git a/models/albumsmodel.h b/models/albumsmodel.h
index 94519d686..fc3b6fbbb 100644
--- a/models/albumsmodel.h
+++ b/models/albumsmodel.h
@@ -49,7 +49,7 @@ public:
     {
         Sort_AlbumArtist,
         Sort_ArtistAlbum,
-        Sort_ArtistAlbumYear
+        Sort_ArtistYearAlbum
     };
 
     enum Columnms
@@ -81,7 +81,6 @@ public:
         bool isAlbum() { return true; }
         void clearSongs();
         void setSongs(MusicLibraryItemAlbum *ai);
-        void setName();
         quint32 trackCount();
         quint32 totalTime();
         void updateStats();
@@ -91,7 +90,6 @@ public:
         const SongItem *getCueFile() const;
         QString artist;
         QString album;
-        QString name;
         quint16 year;
         QList<SongItem *> songs;
         QSet<QString> genres;