diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 20399cd..4bda89e 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -963,8 +963,18 @@
         weatherSymbol.setImageDrawable(weather.getWeatherCodeImage());
         weatherCity.setText(String.format(Locale.getDefault(), res.getString(R.string.weather_city_display), weather.getCity(), weather.getCountry()));
         weatherDesc.setText(weather.getWeatherDesc());
-        weatherMinTemp.setText(String.format(Locale.getDefault(), res.getString(R.string.preferences_n_degree_c_floating), weather.getMinTemp()));
-        weatherMaxTemp.setText(String.format(Locale.getDefault(), res.getString(R.string.preferences_n_degree_c_floating), weather.getMaxTemp()));
+        String weatherText;
+        float minTemp = weather.getMinTemp();
+        float maxTemp = weather.getMaxTemp();
+        if(useFahrenheit()) {
+            weatherText = res.getString(R.string.preferences_n_degree_f_floating);
+            minTemp = WeatherHandler.celsiusToFahrenheit(minTemp);
+            maxTemp = WeatherHandler.celsiusToFahrenheit(maxTemp);
+        } else {
+            weatherText = res.getString(R.string.preferences_n_degree_c_floating);
+        }
+        weatherMinTemp.setText(String.format(Locale.getDefault(), weatherText, minTemp));
+        weatherMaxTemp.setText(String.format(Locale.getDefault(), weatherText, maxTemp));
         if(weather.isSevereWeather()) weatherCity.setCompoundDrawablesWithIntrinsicBounds(null, null, res.getDrawable(R.drawable.ic_warning, null), null);
         else weatherCity.setCompoundDrawables(null, null, null, null);
         weatherHandler.displayHints(weather);