diff --git a/src/app/FlightDelegate.qml b/src/app/FlightDelegate.qml
index db0164a..13a6919 100644
--- a/src/app/FlightDelegate.qml
+++ b/src/app/FlightDelegate.qml
@@ -1,116 +1,118 @@
 /*
     Copyright (C) 2018 Volker Krause <vkrause@kde.org>
 
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This program is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import QtQuick 2.5
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.1 as QQC2
 import org.kde.kirigami 2.4 as Kirigami
 import org.kde.itinerary 1.0
 import "." as App
 
 App.TimelineDelegate {
     id: root
 
     function airportDisplayString(airport)
     {
-        if (airport.name) {
-            return airport.name;
-        }
-        return airport.iataCode;
+        return airport.name ? airport.name : airport.iataCode;
+    }
+
+    function airportDisplayCode(airport)
+    {
+        return airport.iataCode ? airport.iataCode : airport.name;
     }
 
     function seatString() {
         var s = new Array();
         for (var i = 0; i < root.resIds.length; ++i) {
             var res = _reservationManager.reservation(root.resIds[i]);
             if (res.airplaneSeat)
                 s.push(res.airplaneSeat);
         }
         if (s.length === 0)
             return "-";
         return s.join(", ");
     }
 
     headerIconSource: "qrc:///images/flight.svg"
     headerItem: RowLayout {
         QQC2.Label {
             text: i18n("%1 %2 → %3",
                 reservationFor.airline.iataCode + " " + reservationFor.flightNumber,
-                reservationFor.departureAirport.iataCode,
-                reservationFor.arrivalAirport.iataCode)
+                airportDisplayCode(reservationFor.departureAirport),
+                airportDisplayCode(reservationFor.arrivalAirport))
             color: Kirigami.Theme.textColor
             font.pointSize: Kirigami.Theme.defaultFont.pointSize * root.headerFontScale
             Layout.fillWidth: true
         }
         QQC2.Label {
             text: isNaN(reservationFor.boardingTime.getTime()) ?
                 Localizer.formatTime(reservationFor, "departureTime") :
                 Localizer.formatTime(reservationFor, "boardingTime")
             color: Kirigami.Theme.textColor
             font.pointSize: Kirigami.Theme.defaultFont.pointSize * root.headerFontScale
         }
     }
 
     contentItem: ColumnLayout {
         id: topLayout
 
         QQC2.Label {
             text: i18n("Departure from %1: %2",
                 airportDisplayString(reservationFor.departureAirport),
                 Localizer.formatTime(reservationFor, "departureTime") + " ")
             color: Kirigami.Theme.textColor
             wrapMode: Text.WordWrap
             Layout.fillWidth: true
         }
         App.PlaceDelegate {
             place: reservationFor.departureAirport
             Layout.fillWidth: true
         }
         QQC2.Label {
             text: i18n("Terminal: %1  Gate: %2  Seat: %3",
                 reservationFor.departureTerminal ? reservationFor.departureTerminal : "-",
                 reservationFor.departureGate ? reservationFor.departureGate : "-", seatString())
             color: Kirigami.Theme.textColor
         }
 
         Kirigami.Separator {
             Layout.fillWidth: true
         }
 
         QQC2.Label {
             text: i18n("Arrival at %1: %2",
                 airportDisplayString(reservationFor.arrivalAirport),
                 Localizer.formatDateTime(reservationFor, "arrivalTime") + " ")
             color: Kirigami.Theme.textColor
             wrapMode: Text.WordWrap
             Layout.fillWidth: true
         }
         App.PlaceDelegate {
             place: reservationFor.arrivalAirport
             Layout.fillWidth: true
         }
     }
 
     Component {
         id: detailsComponent
         App.FlightPage {
             resIds: root.resIds
         }
     }
 
     onClicked: applicationWindow().pageStack.push(detailsComponent);
 }