diff --git a/app.py b/app.py
index 695625f..0660bf5 100644
--- a/app.py
+++ b/app.py
@@ -2837,6 +2837,45 @@ def team_deactivate(member_id):
     return jsonify({'success': True})
 
 
+@app.route('/team/edit', methods=['POST'])
+def team_edit():
+    """Bearbeitet ein Team-Mitglied."""
+    member_id = request.form.get('member_id')
+    name = request.form.get('name', '').strip()
+    email = request.form.get('email', '').strip()
+    role = request.form.get('role', '').strip()
+    responsibilities = request.form.get('responsibilities', '').strip()
+    telegram_chat_id = request.form.get('telegram_chat_id', '').strip()
+    
+    if not member_id or not name or not email or not role or not responsibilities:
+        flash('Alle Felder außer Telegram Chat ID sind Pflichtfelder!', 'danger')
+        return redirect(url_for('team'))
+    
+    # Optional: Telegram Chat ID als Integer
+    chat_id = None
+    if telegram_chat_id:
+        try:
+            chat_id = int(telegram_chat_id)
+        except ValueError:
+            flash('Telegram Chat ID muss eine Zahl sein!', 'warning')
+            chat_id = None
+    
+    # Update in Datenbank
+    con = sqlite3.connect(EMAIL_JOURNAL_DB)
+    con.execute("""
+        UPDATE team_members 
+        SET name = ?, email = ?, role = ?, responsibilities = ?, telegram_id = ?
+        WHERE id = ?
+    """, (name, email, role, responsibilities, chat_id, member_id))
+    con.commit()
+    con.close()
+    
+    flash(f'✅ Team-Member "{name}" erfolgreich aktualisiert!', 'success')
+    logger.info(f"[Team] Member #{member_id} aktualisiert: {name} ({email})")
+    
+    return redirect(url_for('team'))
+
+
 @app.route('/api/telegram-qr')
 def telegram_qr():
     """Generiert QR-Code für Telegram Bot."""
diff --git a/templates/team.html b/templates/team.html
index 28f4013..2537183 100644
--- a/templates/team.html
+++ b/templates/team.html
@@ -121,9 +121,74 @@
   </div>
 </div>
 
+<!-- Edit Modal -->
+<div class="modal fade" id="editModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">✏️ Team-Member bearbeiten</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+      <form method="POST" action="/team/edit" id="editForm">
+        <div class="modal-body">
+          <input type="hidden" name="member_id" id="edit_member_id">
+          
+          <div class="mb-3">
+            <label class="form-label">Name</label>
+            <input type="text" class="form-control" name="name" id="edit_name" required>
+          </div>
+          
+          <div class="mb-3">
+            <label class="form-label">Email</label>
+            <input type="email" class="form-control" name="email" id="edit_email" required>
+          </div>
+          
+          <div class="mb-3">
+            <label class="form-label">Rolle</label>
+            <input type="text" class="form-control" name="role" id="edit_role" required>
+          </div>
+          
+          <div class="mb-3">
+            <label class="form-label">Telegram Chat ID (optional)</label>
+            <input type="text" class="form-control" name="telegram_chat_id" id="edit_telegram_id" placeholder="z.B. 123456789">
+          </div>
+          
+          <div class="mb-3">
+            <label class="form-label">Aufgaben / Verantwortlichkeiten</label>
+            <textarea class="form-control" name="responsibilities" id="edit_responsibilities" rows="4" required></textarea>
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
+          <button type="submit" class="btn btn-primary">💾 Speichern</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
 <script>
+// Team member data for editing
+const teamMembers = {{ team_members | tojson }};
+
 function editMember(id) {
-  alert('Edit-Funktion in Entwicklung - Member ID: ' + id);
+  const member = teamMembers.find(m => m.id === id);
+  if (!member) {
+    alert('Team-Member nicht gefunden');
+    return;
+  }
+  
+  // Fill form
+  document.getElementById('edit_member_id').value = member.id;
+  document.getElementById('edit_name').value = member.name;
+  document.getElementById('edit_email').value = member.email;
+  document.getElementById('edit_role').value = member.role;
+  document.getElementById('edit_telegram_id').value = member.telegram_id || '';
+  document.getElementById('edit_responsibilities').value = member.responsibilities;
+  
+  // Show modal
+  const modal = new bootstrap.Modal(document.getElementById('editModal'));
+  modal.show();
 }
 
 function deactivateMember(id) {