--- a/aircraft.h	Thu Jun 08 20:17:19 2006 +0000
+++ b/aircraft.h	Fri Jun 09 06:34:28 2006 +0000
@@ -1,5 +1,8 @@
 /* $Id$ */
 
+#ifndef AIRCRAFT_H
+#define AIRCRAFT_H
+
 #include "station_map.h"
 #include "vehicle.h"
 
@@ -14,3 +17,7 @@
 {
 	return IsAircraftInHangar(v) && v->vehstatus & VS_STOPPED;
 }
+
+uint16 AircraftDefaultCargoCapacity(CargoID cid, EngineID engine_type);
+
+#endif /* AIRCRAFT_H */

--- a/aircraft_cmd.c	Thu Jun 08 20:17:19 2006 +0000
+++ b/aircraft_cmd.c	Fri Jun 09 06:34:28 2006 +0000
@@ -164,7 +164,7 @@
  * @param engine Which engine to find a cargo capacity for.
  * @return New cargo capacity value.
  */
-static uint16 AircraftDefaultCargoCapacity(CargoID cid, EngineID engine_type)
+uint16 AircraftDefaultCargoCapacity(CargoID cid, EngineID engine_type)
 {
 	const AircraftVehicleInfo *avi = AircraftVehInfo(engine_type);
 

--- a/aircraft_gui.c	Thu Jun 08 20:17:19 2006 +0000
+++ b/aircraft_gui.c	Fri Jun 09 06:34:28 2006 +0000
@@ -32,6 +32,7 @@
 {
 	const AircraftVehicleInfo *avi = AircraftVehInfo(engine_number);
 	const Engine* e = GetEngine(engine_number);
+	CargoID cargo;
 	YearMonthDay ymd;
 	ConvertDayToYMD(&ymd, e->intro_date);
 
@@ -42,9 +43,19 @@
 	y += 10;
 
 	/* Cargo capacity */
-	SetDParam(0, avi->passenger_capacity);
-	SetDParam(1, avi->mail_capacity);
-	DrawString(x, y, STR_PURCHASE_INFO_AIRCRAFT_CAPACITY, 0);
+	cargo = FindFirstRefittableCargo(engine_number);
+	if (cargo == CT_INVALID || cargo == CT_PASSENGERS) {
+		SetDParam(0, avi->passenger_capacity);
+		SetDParam(1, avi->mail_capacity);
+		DrawString(x, y, STR_PURCHASE_INFO_AIRCRAFT_CAPACITY, 0);
+	} else {
+		/* Note, if the default capacity is selected by the refit capacity
+		 * callback, then the capacity shown is likely to be incorrect. */
+		SetDParam(0, _cargoc.names_long[cargo]);
+		SetDParam(1, AircraftDefaultCargoCapacity(cargo, engine_number));
+		SetDParam(2, STR_9842_REFITTABLE);
+		DrawString(x, y, STR_PURCHASE_INFO_CAPACITY, 0);
+	}
 	y += 10;
 
 	/* Running cost */