diff --git a/app/src/main/java/com/layoutxml/twelveish/WordClockTask.java b/app/src/main/java/com/layoutxml/twelveish/WordClockTask.java
index 274da72..49e224f 100644
--- a/app/src/main/java/com/layoutxml/twelveish/WordClockTask.java
+++ b/app/src/main/java/com/layoutxml/twelveish/WordClockTask.java
@@ -369,7 +369,22 @@ private String capitalise0(int hours, int minutes, int index) {
         String mainPrefix = "";
         StringBuilder prefix;
         if ((minutes > 0) && (!Prefixes[index].equals("")) && (Prefixes[index] != null)) {
-            String[] prefixArray = Prefixes[index].split(" ");
+
+            //Split the prefix with non-break spaces and capitalise each word
+            StringBuilder preString = new StringBuilder();
+            String[] preArray = Prefixes[index].split("\\u00A0");
+
+            for (String word : preArray){
+                if(preString.length() != 0)
+                    preString.append("\u00A0");
+
+                String capitalised = word.substring(0, 1).toUpperCase() + word.substring(1);
+                preString.append(capitalised);
+            }
+
+            // Do the same with spaces
+
+            String[] prefixArray = preString.toString().split(" ");
             prefix = new StringBuilder();
             for (String word : prefixArray) {
                 if (prefix.length() != 0)
@@ -403,8 +418,21 @@ private String capitalise0(int hours, int minutes, int index) {
         if (showSuffixes) {
             StringBuilder suffix;
             if ((minutes > 0) && (!Suffixes[index].equals("")) && (Suffixes[index] != null)) {
+
+                //We first need to replace non-break spaces with regular spaces
+                StringBuilder suffString = new StringBuilder();
+                String[] suffArray = Suffixes[index].split("\\u00A0");
+
+                for (String word : suffArray){
+                    if(suffString.length() != 0)
+                        suffString.append("\u00A0");
+
+                    String capitalised = word.substring(0, 1).toUpperCase() + word.substring(1);
+                    suffString.append(capitalised);
+                }
+
                 if (SuffixNewLine[index]) {
-                    String[] suffixArray = Suffixes[index].split(" ");
+                    String[] suffixArray = suffString.toString().split(" ");
                     suffix = new StringBuilder();
                     for (String word : suffixArray) {
                         if (suffix.length() != 0)
@@ -414,7 +442,7 @@ private String capitalise0(int hours, int minutes, int index) {
                     }
                     mainSuffix = suffix.toString();
                 } else {
-                    mainSuffix = Suffixes[index].toLowerCase();
+                    mainSuffix = suffString.toString().toLowerCase();
                 }
             }
         }
@@ -478,7 +506,7 @@ private String capitalise2(int hours, int minutes, int index) {
                             + middle
                             + ((minutes > 0) ? (SuffixNewLine[index] ? " " : "") : "")
                             + ((showSuffixes) ? ((minutes > 0) ? Suffixes[index] : "") : "");
-            return arrangeWords(text);
+            return arrangeWords(text).toLowerCase();
         }
     }
 
@@ -498,7 +526,7 @@ private String capitalise3(int hours, int minutes, int index) {
                             + middle
                             + ((minutes > 0) ? (SuffixNewLine[index] ? "\n" : "") : "")
                             + ((showSuffixes) ? ((minutes > 0) ? Suffixes[index] : "") : "");
-            return text20.substring(0, 1).toUpperCase() + text20.substring(1).toLowerCase();
+            return text20.substring(0, 1).toUpperCase() + text20.substring(1);
         } else {
             String text20 =
                     ((minutes > 0) ? Prefixes[index] : "")
@@ -506,7 +534,7 @@ private String capitalise3(int hours, int minutes, int index) {
                             + middle
                             + ((minutes > 0) ? (SuffixNewLine[index] ? " " : "") : "")
                             + ((showSuffixes) ? ((minutes > 0) ? Suffixes[index] : "") : "");
-            return arrangeWords(text20.substring(0, 1).toUpperCase() + text20.substring(1).toLowerCase());
+            return arrangeWords(text20.substring(0, 1).toUpperCase() + text20.substring(1));
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 651eeb5..6815408 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -332,15 +332,15 @@
     </string-array>
     <string-array name="PrefixesDE">
         <item>kurz nach</item>
-        <item>bald viertel\u00A0nach</item>
-        <item>fast viertel\u00A0nach</item>
-        <item>viertel\u00A0nach</item>
+        <item>bald Viertel\u00A0nach</item>
+        <item>fast Viertel\u00A0nach</item>
+        <item>Viertel\u00A0nach</item>
         <item>bald halb</item>
         <item>kurz vor halb</item>
         <item>kurz nach halb</item>
-        <item>bald viertel\u00A0vor</item>
-        <item>fast viertel\u00A0vor</item>
-        <item>viertel\u00A0vor</item>
+        <item>bald Viertel\u00A0vor</item>
+        <item>fast Viertel\u00A0vor</item>
+        <item>Viertel\u00A0vor</item>
         <item>bald</item>
         <item>fast</item>
     </string-array>