diff --git a/apps/rebreak-native/components/mail/MailDistributionChart.tsx b/apps/rebreak-native/components/mail/MailDistributionChart.tsx
index 0219a8c..b636e85 100644
--- a/apps/rebreak-native/components/mail/MailDistributionChart.tsx
+++ b/apps/rebreak-native/components/mail/MailDistributionChart.tsx
@@ -112,7 +112,7 @@ export function MailDistributionChart({ data, hero, totalBlocked, isLegend }: Pr
             centerLabel={centerLabel}
             width={DONUT_WIDTH}
           />
-          <View style={{ gap: 6 }}>
+          <View style={{ gap: 6, width: 180 }}>
             {slices.map((slice) => (
               <LegendRow key={slice.label} slice={slice} colors={colors} />
             ))}
@@ -159,26 +159,35 @@ function LegendRow({
   colors: ReturnType<typeof useColors>;
 }) {
   return (
-    <View style={{ flexDirection: 'row', alignItems: 'center', gap: 6 }}>
-      <View
-        style={{
-          width: 8,
-          height: 8,
-          borderRadius: 4,
-          backgroundColor: slice.color,
-        }}
-      />
-      <Text
-        style={{
-          fontSize: 12,
-          fontFamily: slice.isOther ? 'Nunito_400Regular' : 'Nunito_600SemiBold',
-          color: slice.isOther ? colors.textMuted : colors.text,
-          maxWidth: 160,
-        }}
-        numberOfLines={1}
-      >
-        {slice.label}
-      </Text>
+    <View
+      style={{
+        flexDirection: 'row',
+        alignItems: 'center',
+        justifyContent: 'space-between',
+        gap: 8,
+      }}
+    >
+      <View style={{ flexDirection: 'row', alignItems: 'center', gap: 6, flex: 1, minWidth: 0 }}>
+        <View
+          style={{
+            width: 8,
+            height: 8,
+            borderRadius: 4,
+            backgroundColor: slice.color,
+          }}
+        />
+        <Text
+          style={{
+            fontSize: 12,
+            fontFamily: slice.isOther ? 'Nunito_400Regular' : 'Nunito_600SemiBold',
+            color: slice.isOther ? colors.textMuted : colors.text,
+            flexShrink: 1,
+          }}
+          numberOfLines={1}
+        >
+          {slice.label}
+        </Text>
+      </View>
       <Text
         style={{
           fontSize: 12,
diff --git a/apps/rebreak-native/hooks/useMailStats.ts b/apps/rebreak-native/hooks/useMailStats.ts
index d78c332..dbb5d7e 100644
--- a/apps/rebreak-native/hooks/useMailStats.ts
+++ b/apps/rebreak-native/hooks/useMailStats.ts
@@ -73,8 +73,10 @@ export function useMailConnectionStats(
         data = aggregateToWeeks(raw);
       } else if (granularity === 'month') {
         data = aggregateToMonths(raw);
-      } else if (nonEmpty.length > 0 && days <= 7) {
-        // Short window: keep only days with data + days between first and last hit
+      } else if (nonEmpty.length > 0 && nonEmpty.length * 3 < raw.length) {
+        // Sparse data (z.B. nur 1-2 Tage von 30): zoom in auf die echte Range
+        // zwischen erstem und letztem Hit. Vermeidet 30 leere Bars + 1 Bar
+        // ganz rechts wie bei einer frischen Outlook-Connection.
         const firstDate = nonEmpty[0].date;
         const lastDate = nonEmpty[nonEmpty.length - 1].date;
         data = raw.filter((e) => e.date >= firstDate && e.date <= lastDate);